diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json
index ec51a88ead..cff87f84bb 100644
--- a/public/language/en-GB/error.json
+++ b/public/language/en-GB/error.json
@@ -36,7 +36,7 @@
 
 	"invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
 
-	"username-taken": "Username taken",
+	"username-taken": "Username taken. Maybe try %1",
 	"email-taken": "Email address is already taken.",
 	"email-nochange": "The email entered is the same as the email already on file.",
 	"email-invited": "Email was already invited",
diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json
index 535a568d1e..503224e831 100644
--- a/public/language/en-US/error.json
+++ b/public/language/en-US/error.json
@@ -31,7 +31,7 @@
     "invalid-path": "Invalid path",
     "folder-exists": "Folder exists",
     "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
-    "username-taken": "Username taken",
+    "username-taken": "Username taken. Maybe try %1",
     "email-taken": "Email address is already taken.",
     "email-nochange": "The email entered is the same as the email already on file.",
     "email-invited": "Email was already invited",
diff --git a/public/src/client/register.js b/public/src/client/register.js
index f989901e7b..e4ffc4fbea 100644
--- a/public/src/client/register.js
+++ b/public/src/client/register.js
@@ -135,7 +135,7 @@ define('forum/register', [
 				if (results.every(obj => obj.status === 'rejected')) {
 					showSuccess(usernameInput, username_notify, successIcon);
 				} else {
-					showError(usernameInput, username_notify, '[[error:username-taken]]');
+					showError(usernameInput, username_notify, `[[error:username-taken, ${username}suffix]]`);
 				}
 
 				callback();
diff --git a/src/user/create.js b/src/user/create.js
index 1b18281722..063c26ee9c 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -21,7 +21,7 @@ module.exports = function (User) {
 
 		await User.isDataValid(data);
 
-		await lock(data.username, '[[error:username-taken]]');
+		await lock(data.username, `[[error:username-taken, ${data.username}suffix]]`);
 		if (data.email && data.email !== data.username) {
 			await lock(data.email, '[[error:email-taken]]');
 		}