diff --git a/deluge/ui/web/js/deluge-login.js b/deluge/ui/web/js/deluge-login.js
index b88d7a5f1..684ebdf6a 100644
--- a/deluge/ui/web/js/deluge-login.js
+++ b/deluge/ui/web/js/deluge-login.js
@@ -94,11 +94,14 @@ Copyright:
 							msg: _('You entered an incorrect password'),
 							buttons: Ext.MessageBox.OK,
 							modal: false,
+							fn: function() {
+								passwordField.focus();
+							},
 							icon: Ext.MessageBox.WARNING,
 							iconCls: 'x-deluge-icon-warning'
 						});
 					}
-				}.bindWithEvent(this)
+				}.bindWithEvent(this);
 			});
 		},