diff --git a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
index b87af3cae..b0da817f6 100644
--- a/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
@@ -74,7 +74,7 @@ public class CaptchaCommand extends PlayerCommand {
     private void checkRegisterCaptcha(Player player, String captchaCode) {
         final boolean isCorrectCode = registrationCaptchaManager.checkCode(player, captchaCode);
         if (isCorrectCode) {
-            commonService.send(player, MessageKey.CAPTCHA_SUCCESS);
+            commonService.send(player, MessageKey.REGISTER_CAPTCHA_SUCCESS);
             commonService.send(player, MessageKey.REGISTER_MESSAGE);
         } else {
             String newCode = registrationCaptchaManager.getCaptchaCodeOrGenerateNew(player.getName());
diff --git a/src/main/java/fr/xephi/authme/message/MessageKey.java b/src/main/java/fr/xephi/authme/message/MessageKey.java
index 4bf9b625e..43963dcb8 100644
--- a/src/main/java/fr/xephi/authme/message/MessageKey.java
+++ b/src/main/java/fr/xephi/authme/message/MessageKey.java
@@ -137,6 +137,9 @@ public enum MessageKey {
     /** To register you have to solve a captcha code first, please use the command: /captcha <theCaptcha> */
     CAPTCHA_FOR_REGISTRATION_REQUIRED("captcha_for_registration", "<theCaptcha>"),
 
+    /** Valid captcha! You may now register with /register */
+    REGISTER_CAPTCHA_SUCCESS("register_captcha_valid"),
+
     /** A VIP player has joined the server when it was full! */
     KICK_FOR_VIP("kick_forvip"),
 
diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml
index 1964559e1..d43639d55 100644
--- a/src/main/resources/messages/messages_bg.yml
+++ b/src/main/resources/messages/messages_bg.yml
@@ -95,6 +95,8 @@ email_cooldown_error: '&cВече е бил изпратен имейл адре
 usage_captcha: '&3Моля въведе цифрите/буквите от капчата: /captcha <theCaptcha>'
 wrong_captcha: '&cКода е грешен, използвайте: "/captcha THE_CAPTCHA" в чата!'
 valid_captcha: '&2Кода е  валиден!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&2Кода е  валиден!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml
index 9c4557bf6..a0200415e 100644
--- a/src/main/resources/messages/messages_br.yml
+++ b/src/main/resources/messages/messages_br.yml
@@ -99,6 +99,8 @@ email_cooldown_error: '&cUm e-mail já foi enviado, espere mais %time antes de e
 usage_captcha: '&3Para iniciar sessão você tem que resolver um código captcha, utilize o comando "/captcha <theCaptcha>"'
 wrong_captcha: '&cCaptcha errado, por favor, escreva "/captcha THE_CAPTCHA" no chat!'
 valid_captcha: '&2Código Captcha resolvido corretamente!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -106,7 +108,7 @@ valid_captcha: '&2Código Captcha resolvido corretamente!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml
index 4e9ed8dd3..8c01d4a61 100644
--- a/src/main/resources/messages/messages_cz.yml
+++ b/src/main/resources/messages/messages_cz.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cEmail už byl nedávno odeslán. Musíš čekat %time p
 usage_captcha: '&cPoužij: /captcha <theCaptcha>'
 wrong_captcha: '&cŠpatné opsana Captcha, pouzij prosim: /captcha THE_CAPTCHA'
 valid_captcha: '&cZadaná captcha je v pořádku!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&cZadaná captcha je v pořádku!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml
index fc48a9f6b..64b801d51 100644
--- a/src/main/resources/messages/messages_de.yml
+++ b/src/main/resources/messages/messages_de.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cEine E-Mail wurde erst kürzlich versendet. Du musst %t
 usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha <theCaptcha>'
 wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA'
 valid_captcha: '&2Das Captcha ist korrekt!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2Das Captcha ist korrekt!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml
index 833fd7b29..383ec9a80 100644
--- a/src/main/resources/messages/messages_en.yml
+++ b/src/main/resources/messages/messages_en.yml
@@ -95,6 +95,7 @@ usage_captcha: '&3To log in you have to solve a captcha code, please use the com
 wrong_captcha: '&cWrong captcha, please type "/captcha THE_CAPTCHA" into the chat!'
 valid_captcha: '&2Captcha code solved correctly!'
 captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
diff --git a/src/main/resources/messages/messages_eo.yml b/src/main/resources/messages/messages_eo.yml
index 938c0362b..da578175d 100644
--- a/src/main/resources/messages/messages_eo.yml
+++ b/src/main/resources/messages/messages_eo.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cRetmesaĝon jam sendita lastatempe. Vi devas atendi %ti
 usage_captcha: '&3Ensaluti vi devas solvi captcha kodo, bonvolu uzi la komando: /captcha <theCaptcha>'
 wrong_captcha: '&cMalĝusta captcha, bonvolu tajpi "/captcha THE_CAPTCHA" en la babilejo!'
 valid_captcha: '&2Captcha kodo solvita ĝuste!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2Captcha kodo solvita ĝuste!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml
index 8a893c13c..7fe0e61f9 100644
--- a/src/main/resources/messages/messages_es.yml
+++ b/src/main/resources/messages/messages_es.yml
@@ -98,6 +98,8 @@ email_cooldown_error: '&cEl correo ha sido enviado recientemente. Debes esperar
 usage_captcha: '&cUso: /captcha <theCaptcha>'
 wrong_captcha: '&cCaptcha incorrecto, por favor usa: /captcha THE_CAPTCHA'
 valid_captcha: '&c¡ Captcha ingresado correctamente !'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 verification_code_required: '&3¡Este comando es privado y requiere una verificación por correo electrónico! Revisa tu bandeja de entrada y sigue las instrucciones del correo electrónico.'
diff --git a/src/main/resources/messages/messages_et.yml b/src/main/resources/messages/messages_et.yml
index 56ea26277..97ec3afd4 100644
--- a/src/main/resources/messages/messages_et.yml
+++ b/src/main/resources/messages/messages_et.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cEmail juba saadeti. Sa pead ootama %time ennem, kui saa
 usage_captcha: '&3Sisselogimiseks pead lahendama captcha. Tee seda kasutades käsklust: /captcha <theCaptcha>'
 wrong_captcha: '&cVale captcha, kirjuta "/captcha THE_CAPTCHA" chatti!'
 valid_captcha: '&2Captcha lahendatud!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2Captcha lahendatud!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml
index a55565645..86f74c7cb 100644
--- a/src/main/resources/messages/messages_eu.yml
+++ b/src/main/resources/messages/messages_eu.yml
@@ -92,9 +92,11 @@ recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery <zureemaila>'
 # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
 
 # Captcha
-# TODO usage_captcha: '&3To login you have to solve a captcha code, please use the command: /captcha <theCaptcha>'
+# TODO usage_captcha: '&3To log in you have to solve a captcha code, please use the command: /captcha <theCaptcha>'
 # TODO wrong_captcha: '&cWrong captcha, please type "/captcha THE_CAPTCHA" into the chat!'
 # TODO valid_captcha: '&2Captcha code solved correctly!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery <zureemaila>'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml
index 31ef37aa5..b91e2633b 100644
--- a/src/main/resources/messages/messages_fi.yml
+++ b/src/main/resources/messages/messages_fi.yml
@@ -95,6 +95,8 @@ recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery <Sähk
 usage_captcha: '&cKäyttötapa: /captcha <theCaptcha>'
 wrong_captcha: '&cVäärä varmistus, käytä : /captcha THE_CAPTCHA'
 valid_captcha: '&cSinun varmistus onnistui.!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&cSinun varmistus onnistui.!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml
index ad0231e14..4c4cedffe 100644
--- a/src/main/resources/messages/messages_fr.yml
+++ b/src/main/resources/messages/messages_fr.yml
@@ -99,6 +99,8 @@ email_cooldown_error: '&cUn mail de récupération a déjà été envoyé récem
 usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha <theCaptcha>'
 wrong_captcha: '&cCaptcha incorrect, écrivez de nouveau: /captcha THE_CAPTCHA'
 valid_captcha: '&aCaptcha validé! Veuillez maintenant vous connecter.'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Vérification par code
 verification_code_required: '&cCette commande est sensible, elle nécessite donc une confirmation par email.%nl%&cVeuillez suivre les instructions qui viennent de vous être envoyées par email.'
diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml
index 8c03f366c..76c738004 100644
--- a/src/main/resources/messages/messages_gl.yml
+++ b/src/main/resources/messages/messages_gl.yml
@@ -95,6 +95,8 @@ recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery <oTe
 usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha <theCaptcha>'
 wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA'
 valid_captcha: '&cO teu captcha é válido !'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&cO teu captcha é válido !'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml
index 10a5e1d19..f2178691d 100644
--- a/src/main/resources/messages/messages_hu.yml
+++ b/src/main/resources/messages/messages_hu.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cEgy emailt már kiküldtünk. Következő email küldé
 usage_captcha: '&3A bejelentkezéshez CAPTCHA szükséges, kérlek, használd a következő parancsot: "&7/captcha <theCaptcha>&3".'
 wrong_captcha: '&cHibás CAPTCHA, kérlek, írd be a következő parancsot: "&7/captcha THE_CAPTCHA&c"!'
 valid_captcha: '&2A CAPTCHA sikeresen feloldva!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 verification_code_required: '&3Ez a parancs érzékeny, és e-mailes igazolást igényel! Ellenőrizze a bejövő postafiókot, és kövesse az e-mail utasításait.'
diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml
index e36004344..289c563e2 100644
--- a/src/main/resources/messages/messages_id.yml
+++ b/src/main/resources/messages/messages_id.yml
@@ -95,6 +95,8 @@ recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery <ema
 usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha <theCaptcha>"'
 wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!'
 valid_captcha: '&2Kode captcha terselesaikan!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&2Kode captcha terselesaikan!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml
index d6c2504f5..4f8726e5a 100644
--- a/src/main/resources/messages/messages_it.yml
+++ b/src/main/resources/messages/messages_it.yml
@@ -96,6 +96,8 @@ email_cooldown_error: '&cUna email di recupero ti è già stata inviata recentem
 usage_captcha: '&3Per poterti autenticare devi risolvere un captcha, per favore scrivi: /captcha <theCaptcha>'
 wrong_captcha: '&cCaptcha sbagliato, per favore riprova scrivendo: "/captcha THE_CAPTCHA" in chat!'
 valid_captcha: '&2Il captcha inserito è valido!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Codice di verifica
 verification_code_required: '&3Questo comando va a modificare dati sensibili e richiede una verifica tramite email! Controlla la tua posta in arrivo e segui le istruzioni nell''email.'
diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml
index 92bd1ac51..2bf52b109 100644
--- a/src/main/resources/messages/messages_ko.yml
+++ b/src/main/resources/messages/messages_ko.yml
@@ -98,6 +98,8 @@ email_cooldown_error: '&c이메일을 이미 발송했습니다. %time 후에 
 usage_captcha: '&3로그인 하려면 CAPTCHA 코드를 입력해야 합니다. 이 명령어를 사용하세요: /captcha <theCaptcha>'
 wrong_captcha: '&c잘못된 CAPTCHA 코드 입니다. "/captcha THE_CAPTCHA" 형태로 입력해주세요!'
 valid_captcha: '&2CAPTCHA 코드가 확인되었습니다!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # 인증 코드
 verification_code_required: '&3이 명령어는 매우 민감하게 작동되며, 이메일 인증을 필요로 합니다. 이메일을 확인하고 지시에 따르십시오.'
diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml
index ec67058f9..6db5f5480 100644
--- a/src/main/resources/messages/messages_lt.yml
+++ b/src/main/resources/messages/messages_lt.yml
@@ -95,6 +95,8 @@ recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas'
 usage_captcha: '&cPanaudojimas: /captcha <theCaptcha>'
 wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA'
 valid_captcha: '&cJusu captcha Teisinga!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&cJusu captcha Teisinga!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml
index 84aa01259..14214c55f 100644
--- a/src/main/resources/messages/messages_nl.yml
+++ b/src/main/resources/messages/messages_nl.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cEr is recent al een e-mail verzonden. Je moet %time wac
 usage_captcha: '&3Om in te loggen moet je een captcha-code oplossen, gebruik het commando: /captcha <theCaptcha>'
 wrong_captcha: '&cVerkeerde captcha-code, typ alsjeblieft "/captcha THE_CAPTCHA" in de chat!'
 valid_captcha: '&2De captcha-code is geldig!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2De captcha-code is geldig!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml
index 105751c2d..f8cd38ca8 100644
--- a/src/main/resources/messages/messages_pl.yml
+++ b/src/main/resources/messages/messages_pl.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cE-mail został wysłany, musisz poczekać %time przed w
 usage_captcha: '&cWpisz: /captcha <theCaptcha>'
 wrong_captcha: '&cZły kod, proszę wpisać: /captcha THE_CAPTCHA'
 valid_captcha: '&cTwój kod jest nieprawidłowy!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 verification_code_required: '&3Ta komenda wymaga weryfikacji przez e-mail! Sprawdź swoją skrzynkę odbiorczą i postępuj zgodnie z instrukcjami w wiadomości.'
diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml
index d895ca0e7..ac9e9af67 100644
--- a/src/main/resources/messages/messages_pt.yml
+++ b/src/main/resources/messages/messages_pt.yml
@@ -96,6 +96,8 @@ email_cooldown_error: '&cUm email já foi enviado recentemente.Por favor, espere
 usage_captcha: '&cPrecisa digitar um captcha, escreva: /captcha <theCaptcha>'
 wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA'
 valid_captcha: '&cO seu captcha é válido!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -103,7 +105,7 @@ valid_captcha: '&cO seu captcha é válido!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_ro.yml b/src/main/resources/messages/messages_ro.yml
index 43a92170d..0c20f95f9 100644
--- a/src/main/resources/messages/messages_ro.yml
+++ b/src/main/resources/messages/messages_ro.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cAi primit deja un mail pentru schimbarea parolei. Trebu
 usage_captcha: '&3Pentru a te autentifica, te rugam sa folosesti comanda "/captcha <theCaptcha>"'
 wrong_captcha: '&cCodul de verificare este gresit, te rugam foloseste comanda "/captcha THE_CAPTCHA"!'
 valid_captcha: '&2Codul de verificare a fost scris corect!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2Codul de verificare a fost scris corect!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml
index 22bda3a1c..58c6fadb5 100644
--- a/src/main/resources/messages/messages_ru.yml
+++ b/src/main/resources/messages/messages_ru.yml
@@ -94,6 +94,8 @@ email_cooldown_error: '&cПисьмо было отправлено недавн
 usage_captcha: '&3Необходимо ввести текст с каптчи. Используйте «/captcha <theCaptcha>»'
 wrong_captcha: '&cНеверно! Используйте «/captcha THE_CAPTCHA».'
 valid_captcha: '&2Вы успешно решили каптчу!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Код подтверждения
 verification_code_required: '&3Эта команда чувствительна и требует подтверждения электронной почты! Проверьте свою почту и следуйте инструкциям в письме.'
diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml
index 04d335e72..bba72aa99 100644
--- a/src/main/resources/messages/messages_sk.yml
+++ b/src/main/resources/messages/messages_sk.yml
@@ -101,6 +101,8 @@ email_cooldown_error: '&cEmail bol nedávno poslaný. Musíš počkať %time pre
 usage_captcha: '&3Pre prihlásenie musíš vyriešiť captcha kód, prosím použi príkaz: /captcha <theCaptcha>'
 wrong_captcha: '&cNesprávny kód captcha, prosím napíš "/captcha THE_CAPTCHA" do chatu!'
 valid_captcha: '&2Správne si vyriešil captcha kód!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -108,7 +110,7 @@ valid_captcha: '&2Správne si vyriešil captcha kód!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml
index f8ed0b780..c65afc46b 100644
--- a/src/main/resources/messages/messages_tr.yml
+++ b/src/main/resources/messages/messages_tr.yml
@@ -95,6 +95,8 @@ email_cooldown_error: '&cKisa bir sure once eposta gonderildi. Yeni bir eposta a
 usage_captcha: '&3Giris yapmak icin guvenlik kodunu komut yazarak girin "/captcha <theCaptcha>"'
 wrong_captcha: '&cYanlis guvenlik kodu, kullanim sekli "/captcha THE_CAPTCHA" sohbete yazin!'
 valid_captcha: '&2Guvenlik kodu dogrulandi!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&2Guvenlik kodu dogrulandi!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Zaman birimleri
diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml
index 45e0565d8..ec697b2a6 100644
--- a/src/main/resources/messages/messages_uk.yml
+++ b/src/main/resources/messages/messages_uk.yml
@@ -94,6 +94,8 @@ recovery_email: 'Забули пароль? Можете скористатис
 usage_captcha: '&3Для продовження доведеться ввести капчу — "/captcha <theCaptcha>"'
 wrong_captcha: '&cНевірно введена капча! Спробуйте ще раз — "/captcha THE_CAPTCHA"'
 valid_captcha: '&2Капчу прийнято.'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -101,7 +103,7 @@ valid_captcha: '&2Капчу прийнято.'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml
index e5df437fe..a0382b522 100644
--- a/src/main/resources/messages/messages_vn.yml
+++ b/src/main/resources/messages/messages_vn.yml
@@ -95,6 +95,8 @@ email_cooldown_error: '&cMột bức thư đã được gửi gần đây. Bạn
 usage_captcha: '&eĐể đăng nhập vui lòng hãy nhập mã Captcha, gõ lệnh "/captcha <theCaptcha>"'
 wrong_captcha: '&cSai mã captcha, Vui lòng gõ lệnh "/captcha THE_CAPTCHA"!'
 valid_captcha: '&2Mã captcha đã được xác nhận!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&2Mã captcha đã được xác nhận!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml
index d42d30394..784db75a0 100644
--- a/src/main/resources/messages/messages_zhcn.yml
+++ b/src/main/resources/messages/messages_zhcn.yml
@@ -96,6 +96,8 @@ email_cooldown_error: '&c邮件已在几分钟前发送，您需要等待 %time
 usage_captcha: '&8[&6玩家系统&8] &c正确用法：/captcha <theCaptcha>'
 wrong_captcha: '&8[&6玩家系统&8] &c错误的验证码，请输入：“/captcha THE_CAPTCHA”'
 valid_captcha: '&8[&6玩家系统&8] &c你的验证码是有效的！'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # 验证码
 verification_code_required: '&3这个命令非常敏感，需要电子邮件验证！请检查您的收件箱，并遵循邮件的指导。'
diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml
index 71d48e7e0..e7031dae0 100644
--- a/src/main/resources/messages/messages_zhhk.yml
+++ b/src/main/resources/messages/messages_zhhk.yml
@@ -98,6 +98,8 @@ email_cooldown_error: '&8[&6用戶系統&8] &c你已經辦理過重寄郵件，
 usage_captcha: '&8[&6用戶系統&8] &f用法：《 /captcha <theCaptcha> 》'
 wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha THE_CAPTCHA 》 再次輸入。'
 valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -105,7 +107,7 @@ valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_zhmc.yml b/src/main/resources/messages/messages_zhmc.yml
index 56ae46463..5b21ba260 100644
--- a/src/main/resources/messages/messages_zhmc.yml
+++ b/src/main/resources/messages/messages_zhmc.yml
@@ -95,6 +95,8 @@ recovery_email: '&3忘記密碼了嗎？ 請使用命令: "/email recovery [你
 usage_captcha: '&3T要登錄您必須使用captcha驗證碼,請使用命令: "/captcha <theCaptcha>"'
 wrong_captcha: '&c驗證碼錯誤!請按T在聊天中輸入 "/captcha THE_CAPTCHA"'
 valid_captcha: '&2驗證碼正確!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -102,7 +104,7 @@ valid_captcha: '&2驗證碼正確!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml
index af5566392..eb8e3ed61 100644
--- a/src/main/resources/messages/messages_zhtw.yml
+++ b/src/main/resources/messages/messages_zhtw.yml
@@ -99,6 +99,8 @@ recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <
 usage_captcha: '&b【AuthMe】&6請用 &c"/captcha <theCaptcha>" &6來輸入你的驗證碼'
 wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 《 /captcha THE_CAPTCHA 》 再試一次吧。'
 valid_captcha: '&b【AuthMe】&6驗證碼無效!'
+# TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha <theCaptcha>'
+# TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
 
 # Verification code
 # TODO verification_code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.'
@@ -106,7 +108,7 @@ valid_captcha: '&b【AuthMe】&6驗證碼無效!'
 # TODO incorrect_verification_code: '&cIncorrect code, please type "/verification <code>" into the chat, using the code you received by email'
 # TODO verification_code_verified: '&2Your identity has been verified! You can now execute all commands within the current session!'
 # TODO verification_code_already_verified: '&2You can already execute every sensitive command within the current session!'
-# TODO verification_code_expired: '&3Your code has expired! Execute an other sensitive command to get a new code!'
+# TODO verification_code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!'
 # TODO verification_code_email_needed: '&3To verify your identity you need to link an email address with your account!!'
 
 # Time units
diff --git a/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java
index 15b6dba2e..9f47dfae3 100644
--- a/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java
+++ b/src/test/java/fr/xephi/authme/command/executable/captcha/CaptchaCommandTest.java
@@ -70,7 +70,6 @@ public class CaptchaCommandTest {
         Player player = mockPlayerWithName(name);
         given(playerCache.isAuthenticated(name)).willReturn(false);
         given(loginCaptchaManager.isCaptchaRequired(name)).willReturn(false);
-        given(registrationCaptchaManager.isCaptchaRequired(name)).willReturn(true);
         given(dataSource.isAuthAvailable(name)).willReturn(true);
 
         // when
@@ -145,7 +144,7 @@ public class CaptchaCommandTest {
         // then
         verify(registrationCaptchaManager).checkCode(player, captchaCode);
         verify(loginCaptchaManager, only()).isCaptchaRequired(name);
-        verify(commonService).send(player, MessageKey.CAPTCHA_SUCCESS);
+        verify(commonService).send(player, MessageKey.REGISTER_CAPTCHA_SUCCESS);
         verify(commonService).send(player, MessageKey.REGISTER_MESSAGE);
     }