diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js
index 8c5d093c..e4209108 100644
--- a/js/app/controllers/share.js
+++ b/js/app/controllers/share.js
@@ -68,16 +68,16 @@ angular.module('passmanApp')
 		$scope.accessLevels = [
 			{
 				label: 'Can edit',
-				value: 'CAN_EDIT'
+				value: '2'
 			},
 			{
 				label: 'Can view',
-				value: 'CAN_VIEW'
+				value: '1'
 			}
 		];
 
 		$scope.inputSharedWith = [];
-		$scope.selectedAccessLevel = 'CAN_VIEW';
+		$scope.selectedAccessLevel = '1';
 
 		$scope.searchUsers = function($query){
 			 return ShareService.search($query)
@@ -99,5 +99,14 @@ angular.module('passmanApp')
 			}
 		}
 
-
+		$scope.applyShare = function(){
+			console.log("boom!");
+			var list = $scope.share_settings.credentialSharedWithUserAndGroup;
+			console.log(list);
+			for (var i = 0; i < list.length; i++){
+				ShareService.getVaultsByUser(list[i].user_id).then(function(data){
+					console.log(data);
+				})
+			}
+		}
 	}]);
diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js
index 3ba69963..1fc7626a 100644
--- a/js/app/controllers/vault.js
+++ b/js/app/controllers/vault.js
@@ -74,11 +74,11 @@ angular.module('passmanApp')
 
 			};
 			var key_size = 1024;
-			ShareService.generateRSAKeys(key_size, function (progress) {
+			ShareService.generateRSAKeys(key_size).progress(function (progress) {
 				var p = progress > 0 ? 2 : 1;
 				$scope.$apply();
 				$scope.creating_keys = 'Generating sharing keys (' + p + ' / 2)';
-			}, function (kp) {
+			}).then(function (kp) {
 				var pem = ShareService.rsaKeyPairToPEM(kp);
 				$scope.creating_keys = false;
 				$scope.sharing_keys.private_sharing_key = pem.privateKey;
diff --git a/js/templates.js b/js/templates.js
index da4c3ad1..749df644 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -101,7 +101,7 @@ angular.module('views/settings.html', []).run(['$templateCache', function($templ
 angular.module('views/share_credential.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/share_credential.html',
-    '<div id="controls"><div class="actions creatable"><div class="breadcrumb"><div class="crumb svg ui-droppable" data-dir="/"><a ng-click="logout()"><i class="fa fa-home"></i></a></div><div class="crumb svg" data-dir="/Test"><a ng-click="cancel()">{{active_vault.name}}</a></div><div class="crumb svg last" data-dir="/Test"><a ng-if="storedCredential.credential_id">Share credential "{{storedCredential.label}}"</a></div></div></div></div><ul class="tab_header"><li ng-repeat="tab in tabs track by $index" class="tab" ng-class="{active:isActiveTab(tab)}" ng-click="onClickTab(tab)">{{tab.title}}</li></ul><div class="tab_container edit_credential"><div ng-include="currentTab.url"></div><button>Share</button> <button ng-click="cancel()">Cancel</button></div>');
+    '<div id="controls"><div class="actions creatable"><div class="breadcrumb"><div class="crumb svg ui-droppable" data-dir="/"><a ng-click="logout()"><i class="fa fa-home"></i></a></div><div class="crumb svg" data-dir="/Test"><a ng-click="cancel()">{{active_vault.name}}</a></div><div class="crumb svg last" data-dir="/Test"><a ng-if="storedCredential.credential_id">Share credential "{{storedCredential.label}}"</a></div></div></div></div><ul class="tab_header"><li ng-repeat="tab in tabs track by $index" class="tab" ng-class="{active:isActiveTab(tab)}" ng-click="onClickTab(tab)">{{tab.title}}</li></ul><div class="tab_container edit_credential"><div ng-include="currentTab.url"></div><button ng-click="applyShare()">Share</button> <button ng-click="cancel()">Cancel</button></div>');
 }]);
 
 angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) {
diff --git a/templates/views/share_credential.html b/templates/views/share_credential.html
index 938661e4..30349a48 100644
--- a/templates/views/share_credential.html
+++ b/templates/views/share_credential.html
@@ -23,7 +23,7 @@
 <div class="tab_container edit_credential">
 	<div ng-include="currentTab.url"></div>
 
-	<button>Share</button>
+	<button ng-click="applyShare()">Share</button>
 	<button ng-click="cancel()">Cancel</button>
 </div>