diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index c7b427545..bdb950093 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -268,6 +268,7 @@ update_password_strength (UmAccountDialog *self)
         const gchar *password;
         const gchar *username;
         const gchar *hint;
+        const gchar *verify;
         gint strength_level;
 
         password = gtk_entry_get_text (GTK_ENTRY (self->local_password));
@@ -286,6 +287,11 @@ update_password_strength (UmAccountDialog *self)
                 clear_entry_validation_error (GTK_ENTRY (self->local_password));
         }
 
+        verify = gtk_entry_get_text (GTK_ENTRY (self->local_verify));
+        if (strlen (verify) == 0) {
+                gtk_widget_set_sensitive (self->local_verify, strength_level > 1);
+        }
+
         return strength_level;
 }
 
diff --git a/panels/user-accounts/um-password-dialog.c b/panels/user-accounts/um-password-dialog.c
index 0a142eda2..b3c8e8b54 100644
--- a/panels/user-accounts/um-password-dialog.c
+++ b/panels/user-accounts/um-password-dialog.c
@@ -69,6 +69,7 @@ update_password_strength (UmPasswordDialog *um)
         const gchar *username;
         gint strength_level;
         const gchar *hint;
+        const gchar *verify;
 
         if (um->user == NULL) {
                 return 0;
@@ -92,6 +93,11 @@ update_password_strength (UmPasswordDialog *um)
                 clear_entry_validation_error (GTK_ENTRY (um->password_entry));
         }
 
+        verify = gtk_entry_get_text (GTK_ENTRY (um->verify_entry));
+        if (strlen (verify) == 0) {
+                gtk_widget_set_sensitive (um->verify_entry, strength_level > 1);
+        }
+
         return strength_level;
 }