diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js
index f084b24e..40820336 100644
--- a/js/app/controllers/edit_credential.js
+++ b/js/app/controllers/edit_credential.js
@@ -300,6 +300,11 @@
 					}
 
 
+					if ($scope.storedCredential.password !== storedCredential.password_repeat){
+						NotificationService.showNotification($translate.instant('password.do.not.match'), 5000);
+						return;
+					}
+
 					//@TODO  validation
 					//@TODO When credential is expired and has renew interval set, calc new expire time.
 					delete $scope.storedCredential.password_repeat;
diff --git a/tests/db/DatabaseHelperTest.php b/tests/db/DatabaseHelper test.php
similarity index 100%
rename from tests/db/DatabaseHelperTest.php
rename to tests/db/DatabaseHelper test.php