diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js
index dda5f1a85ec..dd8da7f11ea 100644
--- a/src/app/global/mainController.js
+++ b/src/app/global/mainController.js
@@ -49,8 +49,8 @@ angular
             vm.openControlSidebar = vm.usingControlSidebar && $document.width() > 768;
         });
 
-        $scope.addLogin = function () {
-            $scope.$broadcast('vaultAddLogin');
+        $scope.addCipher = function () {
+            $scope.$broadcast('vaultAddCipher');
         };
 
         $scope.addFolder = function () {
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index 50e7e8decad..ce865d722b0 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -168,7 +168,7 @@
             });
         };
 
-        $scope.$on('vaultAddLogin', function (event, args) {
+        $scope.$on('vaultAddCipher', function (event, args) {
             $scope.addCipher();
         });
 
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index 0ff92cd6cf7..47b014cea92 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -54,7 +54,7 @@
                     <ul class="dropdown-menu dropdown-menu-right">
                         <li>
                             <a href="#" stop-click ng-click="addCipher(null, true)">
-                                <i class="fa fa-fw fa-plus-circle"></i> Add Item
+                                <i class="fa fa-fw fa-plus-circle"></i> New Item
                             </a>
                         </li>
                     </ul>
@@ -74,7 +74,7 @@
                 <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
                         <tr ng-repeat="cipher in favoriteCiphers = (ciphers | filter: { favorite: true } |
-                            filter: (main.searchVaultText || '')) track by cipher.id">
+                            filter: cipherFilter | filter: (main.searchVaultText || '')) track by cipher.id">
                             <td style="width: 70px;">
                                 <div class="btn-group" data-append-to="body">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -149,7 +149,7 @@
                     <ul class="dropdown-menu dropdown-menu-right">
                         <li>
                             <a href="#" stop-click ng-click="addCipher(folder)">
-                                <i class="fa fa-fw fa-plus-circle"></i> Add Item
+                                <i class="fa fa-fw fa-plus-circle"></i> New Item
                             </a>
                         </li>
                         <li ng-show="folder.id">
diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html
index ba93ec3fc0a..dc0379beb09 100644
--- a/src/app/views/userLayout.html
+++ b/src/app/views/userLayout.html
@@ -46,8 +46,8 @@
                 <a ui-sref="backend.user.vault"><i class="fa fa-lock fa-fw"></i> <span>My Vault</span></a>
                 <ul class="treeview-menu" ng-class="{'menu-open': $state.includes('backend.user.vault')}">
                     <li>
-                        <a href="#" stop-click ng-click="addLogin()">
-                            <i class="fa fa-plus-circle fa-fw"></i> New Login
+                        <a href="#" stop-click ng-click="addCipher()">
+                            <i class="fa fa-plus-circle fa-fw"></i> New Item
                         </a>
                     </li>
                     <li>