diff --git a/public/src/client/login.js b/public/src/client/login.js
index 65b54aa446..c86e743be2 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -37,6 +37,11 @@ define('forum/login', ['translator'], function(translator) {
 							errorEl.find('p').translateText(data.responseText);
 							errorEl.show();
 							submitEl.removeClass('disabled');
+
+							// Select the entire password if that field has focus
+							if ($('#password:focus').size()) {
+								$('#password').select();
+							}
 						}
 					}
 				});