diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 4c44138524..2f40887067 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -58,6 +58,7 @@
 	"password": "Password",
 	"username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
 	"password_same_as_username": "Your password is the same as your username, please select another password.",
+	"password_same_as_email": "Your password is the same as your email, please select another password.",
 
 	"upload_picture": "Upload picture",
 	"upload_a_picture": "Upload a picture",
diff --git a/public/src/client/register.js b/public/src/client/register.js
index 92cf47da13..f5096376c2 100644
--- a/public/src/client/register.js
+++ b/public/src/client/register.js
@@ -185,6 +185,8 @@ define('forum/register', ['csrf', 'translator'], function(csrf, translator) {
 			showError(password_notify, '[[user:change_password_error]]');
 		} else if (password === $('#username').val()) {
 			showError(password_notify, '[[user:password_same_as_username]]');
+		} else if (password === $('#email').val()) {
+			showError(password_notify, '[[user:password_same_as_email]]');
 		} else {
 			showSuccess(password_notify, successIcon);
 		}