diff --git a/core/js/js.js b/core/js/js.js
index 41041a4288..714529fe5d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1579,6 +1579,7 @@ OC.PasswordConfirmation = {
 				}
 			},
 			error: function() {
+				OC.PasswordConfirmation.requirePasswordConfirmation(self.callback);
 				OC.Notification.showTemporary(t('core', 'Failed to authenticate, try again'));
 			}
 		});
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index fc0734e9df..3b5c1ae719 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -149,6 +149,7 @@ var OCdialogs = {
 				modal        : modal,
 				buttons      : buttonlist
 			});
+			input.focus();
 			OCdialogs.dialogsCounter++;
 		});
 	},