diff --git a/src/app/vault/vaultAddLoginController.js b/src/app/vault/vaultAddLoginController.js
index e5618a74d4..9513459cf9 100644
--- a/src/app/vault/vaultAddLoginController.js
+++ b/src/app/vault/vaultAddLoginController.js
@@ -1,11 +1,13 @@
 angular
     .module('bit.vault')
 
-    .controller('vaultAddLoginController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, passwordService, folders, selectedFolder, $analytics) {
+    .controller('vaultAddLoginController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService,
+        passwordService, folders, selectedFolder, $analytics, checkedFavorite) {
         $analytics.eventTrack('vaultAddLoginController', { category: 'Modal' });
         $scope.folders = folders;
         $scope.login = {
-            folderId: selectedFolder ? selectedFolder.id : null
+            folderId: selectedFolder ? selectedFolder.id : null,
+            favorite: checkedFavorite === true
         };
 
         $scope.savePromise = null;
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index 50f54026fc..dafa882387 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -92,14 +92,15 @@
             $scope.addLogin();
         });
 
-        $scope.addLogin = function (folder) {
+        $scope.addLogin = function (folder, favorite) {
             var addModel = $uibModal.open({
                 animation: true,
                 templateUrl: 'app/vault/views/vaultAddLogin.html',
                 controller: 'vaultAddLoginController',
                 resolve: {
                     folders: function () { return $scope.folders; },
-                    selectedFolder: function () { return folder; }
+                    selectedFolder: function () { return folder; },
+                    checkedFavorite: function () { return favorite; }
                 }
             });
 
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index cc0d617fb1..04ee8bda39 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -23,7 +23,7 @@
                     </button>
                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
                         <li>
-                            <a href="#" ng-click="addLogin()">Add Login</a>
+                            <a href="#" ng-click="addLogin(null, true)">Add Login</a>
                         </li>
                     </ul>
                 </div>
@@ -35,7 +35,7 @@
         <div class="box-body" ng-class="{'no-padding': favoriteLogins.length}">
             <div ng-show="!favoriteLogins.length">
                 <p>No favorite logins.</p>
-                <button type="button" ng-click="addLogin()" class="btn btn-default btn-flat">Add a Login</button>
+                <button type="button" ng-click="addLogin(null, true)" class="btn btn-default btn-flat">Add a Login</button>
             </div>
             <div class="table-responsive" ng-show="favoriteLogins.length">
                 <table class="table table-striped table-hover table-selectable">
@@ -54,15 +54,17 @@
                                         uib-tooltip="Delete">
                                     <i class="fa fa-lg fa-trash"></i>
                                 </button>
-                                <button type="button" ng-click="share(login)" class="btn btn-link btn-table"
-                                        uib-tooltip="Share">
-                                    <i class="fa fa-lg fa-share-alt"></i>
-                                </button>
+                                <div class="tooltip-wrapper"
+                                     uib-tooltip="{{login.organizationId ? 'Already shared.' : 'Share'}}">
+                                    <button type="button" ng-click="share(login)" class="btn btn-link btn-table"
+                                            ng-disabled="login.organizationId !== null">
+                                        <i class="fa fa-lg fa-share-alt"></i>
+                                    </button>
+                                </div>
                             </td>
                             <td ng-click="editLogin(login)">
                                 <span ng-click="$event.stopPropagation()">
                                     <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
-                                    <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
                                 </span>
                             </td>
                             <td ng-click="editLogin(login)">
@@ -126,11 +128,13 @@
                                         uib-tooltip="Delete">
                                     <i class="fa fa-lg fa-trash"></i>
                                 </button>
-                                <button type="button" ng-click="share(login)" class="btn btn-link btn-table"
-                                        uib-tooltip="{{login.organizationId ? 'Already shared.' : 'Share'}}"
-                                        ng-disabled="login.organizationId !== null">
-                                    <i class="fa fa-lg fa-share-alt"></i>
-                                </button>
+                                <div class="tooltip-wrapper"
+                                     uib-tooltip="{{login.organizationId ? 'Already shared.' : 'Share'}}">
+                                    <button type="button" ng-click="share(login)" class="btn btn-link btn-table"
+                                            ng-disabled="login.organizationId !== null">
+                                        <i class="fa fa-lg fa-share-alt"></i>
+                                    </button>
+                                </div>
                             </td>
                             <td ng-click="editLogin(login)">
                                 <span ng-click="$event.stopPropagation()">
diff --git a/src/less/vault.less b/src/less/vault.less
index 7978e8074a..6cc3c1bbee 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -250,3 +250,7 @@ form .btn .loading-icon {
     text-decoration: line-through;
     color: @text-muted;
 }
+
+.tooltip-wrapper {
+    display: inline-block;
+}