diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js
index a4c4c09a..bd42548e 100644
--- a/js/app/controllers/share.js
+++ b/js/app/controllers/share.js
@@ -290,7 +290,7 @@ angular.module('passmanApp')
 				} else {
 
 					ShareService.generateSharedKey(20).then(function (key) {
-						var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key);
+
 						// encryptedSharedCredential.set_share_key = true;
 						// CredentialService.updateCredential(encryptedSharedCredential, true).then(function (sharedCredential) {
 						// 	$scope.storedCredential = ShareService.decryptSharedCredential(sharedCredential, key);
@@ -322,8 +322,13 @@ angular.module('passmanApp')
 						// 		CredentialService.updateRevision(_revision);
 						// 	}
 						// });
-						var old_key = VaultService.getActiveVault().vaultKey
+						console.log($scope.storedCredential)
+						var encryptedSharedCredential = angular.copy($scope.storedCredential);
+						var old_key = VaultService.getActiveVault().vaultKey;
 						console.log(encryptedSharedCredential);
+						encryptedSharedCredential.set_share_key = true;
+						encryptedSharedCredential.shared_key = EncryptService.encryptString(key);
+
 						CredentialService.reencryptCredential(encryptedSharedCredential.credential_id, old_key, key).progress(function(data){
 							console.log(data);
 						}).then(function(data){
diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js
index 4b8b06b1..9657bbde 100644
--- a/js/app/services/credentialservice.js
+++ b/js/app/services/credentialservice.js
@@ -8,7 +8,7 @@
  * Service in the passmanApp.
  */
 angular.module('passmanApp')
-	.service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', 'CredentialService', function ($http, EncryptService, VaultService, FileService, CredentialService) {
+	.service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', function ($http, EncryptService, VaultService, FileService) {
 		var credential = {
 			'credential_id': null,
 			'guid': null,
@@ -215,7 +215,7 @@ angular.module('passmanApp')
 				};
 
 				var promise_revisions_update = function(){
-					CredentialService.getRevisions(this.parent.plain_credential.guid).then((function (revisions) {
+					service.getRevisions(this.parent.plain_credential.guid).then((function (revisions) {
 						// Double, so we include the actual upload of the data back to the server
 						this.total = revisions.length * 2;
 						this.upload = 0;