diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/output/MessageKey.java
index 1ab8aaa4a..3fd7c747b 100644
--- a/src/main/java/fr/xephi/authme/output/MessageKey.java
+++ b/src/main/java/fr/xephi/authme/output/MessageKey.java
@@ -41,7 +41,7 @@ public enum MessageKey {
 
     REGISTER_EMAIL_MESSAGE("reg_email_msg"),
 
-    MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_acc"),
+    MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_count", "%reg_names"),
 
     USAGE_REGISTER("usage_reg"),
 
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index 0d71c6b8d..d30d08366 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -1,5 +1,7 @@
 package fr.xephi.authme.process.register;
 
+import java.util.List;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -99,13 +101,13 @@ public class AsyncRegister {
     }
 
     private void emailRegister() {
-        Integer maxReg = Settings.getmaxRegPerIp;
-        Integer size = 0;
-        if (Settings.getmaxRegPerEmail > 0
-            && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
-            && (size = database.getAllAuthsByIp(ip).size()) >= maxReg) {
-            m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), size.toString());
-            return;
+        if(Settings.getmaxRegPerEmail > 0 && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)) {
+            Integer maxReg = Settings.getmaxRegPerIp;
+            List<String> otherAccounts = database.getAllAuthsByIp(ip);
+            if (otherAccounts.size() >= maxReg) {
+                m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), Integer.toString(otherAccounts.size()), otherAccounts.toString());
+                return;
+            }
         }
         final HashedPassword hashedPassword = plugin.getPasswordSecurity().computeHash(password, name);
         PlayerAuth auth = PlayerAuth.builder()
diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml
index 6c0189a36..5b474e2dc 100644
--- a/src/main/resources/messages/messages_en.yml
+++ b/src/main/resources/messages/messages_en.yml
@@ -12,7 +12,7 @@ login: '&2Successful login!'
 vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!'
 user_regged: '&cYou already have registered this username!'
 usage_reg: '&cUsage: /register <password> <ConfirmPassword>'
-max_reg: '&cYou have exceeded the maximum number of registrations (%reg_acc/%max_acc) for your connection!'
+max_reg: '&cYou have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection!'
 no_perm: '&4You don''t have the permission to perform this action!'
 error: '&4An unexpected error occurred, please contact an administrator!'
 login_msg: '&cPlease, login with the command "/login <password>"'