diff --git a/src/app/organization/views/organizationDashboard.html b/src/app/organization/views/organizationDashboard.html
index 115fc392ca..f426647b6f 100644
--- a/src/app/organization/views/organizationDashboard.html
+++ b/src/app/organization/views/organizationDashboard.html
@@ -1,7 +1,7 @@
 <section class="content-header">
     <h1>
         Dashboard
-        <small>Some org</small>
+        <small>{{orgProfile.name}}</small>
     </h1>
 </section>
 <section class="content">
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index d247eaca9a..6188a7fa67 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -4,6 +4,7 @@
     .controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr,
         cipherService, $q, $localStorage, $timeout, $rootScope) {
         $scope.loading = true;
+        $scope.logins = [];
         $scope.favoriteCollapsed = $localStorage.collapsedFolders && 'favorite' in $localStorage.collapsedFolders;
 
         $scope.$on('$viewContentLoaded', function () {
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index f7a889c3c0..3ac8176dd6 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -1,7 +1,12 @@
 <section class="content-header">
     <h1>
         My Vault
-        <small>{{vaultFolders.length > 0 ? vaultFolders.length - 1 : 0}} folders, {{logins.length}} logins</small>
+        <small>
+            <span ng-pluralize
+                  count="vaultFolders.length > 0 ? vaultFolders.length - 1 : 0"
+                  when="{'1': '{} folder', 'other': '{} folders'}"></span>,
+            <span ng-pluralize count="logins.length" when="{'1': '{} login', 'other': '{} logins'}"></span>
+        </small>
     </h1>
 </section>
 <section class="content">
@@ -13,7 +18,8 @@
         <div class="box-header with-border">
             <h3 class="box-title">
                 <i class="fa fa-star"></i>
-                Favorites <small>{{favoriteLogins.length}} logins</small>
+                Favorites
+                <small ng-pluralize count="favoriteLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
             </h3>
             <div class="box-tools">
                 <div class="btn-group">
@@ -89,7 +95,8 @@
         <div class="box-header with-border">
             <h3 class="box-title">
                 <i class="fa" ng-class="{'fa-folder-open': folder.id !== null, 'fa-folder-open-o': folder.id === null}"></i>
-                {{folder.name}} <small>{{folderLogins.length}} logins</small>
+                {{folder.name}}
+                <small ng-pluralize count="folderLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
             </h3>
             <div class="box-tools">
                 <div class="btn-group">
diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html
index 8b35e3d6fc..f6221c14ca 100644
--- a/src/app/vault/views/vaultSubvaults.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -1,7 +1,10 @@
 <section class="content-header">
     <h1>
         Subvaults
-        <small>{{subvaults.length}} subvaults, {{logins.length}} logins</small>
+        <small>
+            <span ng-pluralize count="subvaults.length" when="{'1': '{} subvault', 'other': '{} subvaults'}"></span>,
+            <span ng-pluralize count="logins.length" when="{'1': '{} login', 'other': '{} logins'}"></span>
+        </small>
     </h1>
 </section>
 <section class="content">
@@ -27,7 +30,8 @@
         <div class="box-header with-border">
             <h3 class="box-title">
                 <i class="fa fa-share-alt-square"></i>
-                {{subvault.name}} <small>{{subvaultLogins.length}} logins</small>
+                {{subvault.name}}
+                <small ng-pluralize count="subvaultLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
             </h3>
             <div class="box-tools">
                 <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"
diff --git a/src/less/vault.less b/src/less/vault.less
index deb4455d4e..0c41af0036 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -54,6 +54,10 @@ h1, h2, h3, h4, h5, h6,
     .subsection {
         padding: 10px;
         text-align: center;
+
+        ul {
+            text-align: left;
+        }
     }
 }