diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index ae9fc1cf..be99a769 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -385,6 +385,13 @@
 
                 });
 
+
+                $scope.getListSize = function(){
+                	var l = $scope.filtered_credentials;//$scope.active_vault.credentials.length
+                	console.log(l.length);
+                	return l.length;
+				};
+
                 $scope.filterAll = function(){
                     $scope.selectedtags=[];
                     $scope.filterOptions.filterText="";
diff --git a/sass/credentials.scss b/sass/credentials.scss
index a216889b..dd197fdd 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -168,7 +168,6 @@
     }
 
     .searchboxContainer {
-
       /*display: inline-block;*/
       visibility: hidden;
       display: none;
@@ -460,6 +459,12 @@
       .share{
         overflow:hidden;
       }
+      .nopasswords{
+        margin-right: auto;
+        margin-left: auto;
+        margin-top: 10%;
+        text-align: center;
+      }
     }
 
     .app_sidebar {
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html
index 59cbbe0e..eb512b75 100644
--- a/templates/views/show_vault.html
+++ b/templates/views/show_vault.html
@@ -89,6 +89,13 @@
 				</div>
 			</li>
 		</ul>
+		<div ng-if="getListSize()==0" class="nopasswords">
+			<b>{{'Hello there!' | translate}}</b><br>
+			<div>{{'It does not seem that you have any passwords. Do you want to add one?' | translate}}</div>
+			<div class="">
+				<button ng-click="addCredential()">+</button>
+			</div>
+		</div>
 	</div>
 </div>