diff --git a/public/src/forum/login.js b/public/src/forum/login.js
index 9f1b5f1ab1..c4600c36ac 100644
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@@ -5,13 +5,31 @@ define('forum/login', function() {
 	var	Login = {};
 
 	Login.init = function() {
-		$('#login').on('click', function(e) {
-			$('#login-error-notify').hide();
+		var errorEl = $('#login-error-notify'),
+			submitEl = $('#login'),
+			formEl = $('#login-form');
+
+		submitEl.on('click', function(e) {
+			e.preventDefault();
+
+			if (!$('#username').val() || !$('#password').val()) {
+				translator.translate('[[error:invalid-username-or-password]]', function(translated) {
+					errorEl.find('p').text(translated)
+					errorEl.show();
+				});
+			} else {
+				errorEl.hide();
+
+				if (!submitEl.hasClass('disabled')) {
+					submitEl.addClass('disabled');
+					formEl.submit();
+				}
+			}
 		});
 
 		$('#login-error-notify button').on('click', function(e) {
 			e.preventDefault();
-			$('#login-error-notify').hide();
+			errorEl.hide();
 		});
 
 		$('#content #username').focus();