diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index dc8bfaeaf1..86e5d1f66d 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -266,12 +266,15 @@ define('forum/account/edit', ['forum/account/header', 'uploader'], function(head
 		password_confirm.on('blur', onPasswordConfirmChanged);
 
 		$('#changePasswordBtn').on('click', function() {
+			var btn = $(this);
 			if ((passwordvalid && passwordsmatch) || app.user.isAdmin) {
+				btn.addClass('disabled').find('i').removeClass('hide');
 				socket.emit('user.changePassword', {
 					'currentPassword': currentPassword.val(),
 					'newPassword': password.val(),
 					'uid': ajaxify.variables.get('theirid')
 				}, function(err) {
+					btn.removeClass('disabled').find('i').addClass('hide');
 					currentPassword.val('');
 					password.val('');
 					password_confirm.val('');
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 4df8915994..5f844650a6 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -151,6 +151,7 @@ SocketUser.changePassword = function(socket, data, callback) {
 			targetUid: data.uid,
 			ip: socket.ip
 		});
+		callback();
 	});
 };