diff --git a/app/src/main/java/es/wolfi/app/passman/fragments/VaultAddFragment.java b/app/src/main/java/es/wolfi/app/passman/fragments/VaultAddFragment.java
index 9f7b66dc..74700c5a 100644
--- a/app/src/main/java/es/wolfi/app/passman/fragments/VaultAddFragment.java
+++ b/app/src/main/java/es/wolfi/app/passman/fragments/VaultAddFragment.java
@@ -137,6 +137,12 @@ public void onClick(View view) {
             add_vault_name_header.setTextColor(getResources().getColor(R.color.colorAccent));
         }
 
+        if (add_vault_password.getText().toString().equals("")) {
+            add_vault_password_header.setTextColor(getResources().getColor(R.color.danger));
+            add_vault_password_repeat_header.setTextColor(getResources().getColor(R.color.danger));
+            return;
+        }
+
         if (!add_vault_password.getText().toString().equals(add_vault_password_repeat.getText().toString())) {
             add_vault_password_header.setTextColor(getResources().getColor(R.color.danger));
             add_vault_password_repeat_header.setTextColor(getResources().getColor(R.color.danger));