diff --git a/public/src/client/account/edit/email.js b/public/src/client/account/edit/email.js
index 4014039740..1772f76c49 100644
--- a/public/src/client/account/edit/email.js
+++ b/public/src/client/account/edit/email.js
@@ -19,6 +19,10 @@ define('forum/account/edit/email', ['forum/account/header'], function(header) {
 				return;
 			}
 
+			if (userData.email === userData.password) {
+				return app.alertError('[[user:email_same_as_password]]');
+			}
+
 			var btn = $(this);
 			btn.addClass('disabled').find('i').removeClass('hide');
 
diff --git a/public/src/client/account/edit/password.js b/public/src/client/account/edit/password.js
index d5e500e7df..3dc36c25b2 100644
--- a/public/src/client/account/edit/password.js
+++ b/public/src/client/account/edit/password.js
@@ -21,12 +21,15 @@ define('forum/account/edit/password', ['forum/account/header', 'translator'], fu
 		var passwordsmatch = false;
 
 		function onPasswordChanged() {
+			passwordvalid = false;
 			if (password.val().length < ajaxify.data.minimumPasswordLength) {
 				showError(password_notify, '[[user:change_password_error_length]]');
-				passwordvalid = false;
 			} else if (!utils.isPasswordValid(password.val())) {
 				showError(password_notify, '[[user:change_password_error]]');
-				passwordvalid = false;
+			} else if (password.val() === ajaxify.data.username) {
+				showError(password_notify, '[[user:password_same_as_username]]');
+			} else if (password.val() === ajaxify.data.email) {
+				showError(password_notify, '[[user:password_same_as_email]]');
 			} else {
 				showSuccess(password_notify);
 				passwordvalid = true;
diff --git a/public/src/client/account/edit/username.js b/public/src/client/account/edit/username.js
index 4448568157..64f9baa0bc 100644
--- a/public/src/client/account/edit/username.js
+++ b/public/src/client/account/edit/username.js
@@ -18,6 +18,11 @@ define('forum/account/edit/username', ['forum/account/header'], function(header)
 			if (!userData.username) {
 				return;
 			}
+
+			if (userData.username === userData.password) {
+				return app.alertError('[[user:username_same_as_password]]');
+			}
+
 			var btn = $(this);
 			btn.addClass('disabled').find('i').removeClass('hide');
 			socket.emit('user.changeUsernameEmail', userData, function(err, data) {