diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 622ceafe4..d7cc0efad 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -50,6 +50,7 @@ import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsMigrationService;
 import fr.xephi.authme.settings.Spawn;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
+import fr.xephi.authme.settings.properties.EmailSettings;
 import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
@@ -786,7 +787,7 @@ public class AuthMe extends JavaPlugin {
             public void run() {
                 for (PlayerAuth auth : database.getLoggedPlayers()) {
                     String email = auth.getEmail();
-                    if (email == null || email.isEmpty() || email.equalsIgnoreCase("your@email.com")) {
+                    if (StringUtils.isEmpty(email) || email.equalsIgnoreCase("your@email.com")) {
                         Player player = Utils.getPlayer(auth.getRealName());
                         if (player != null) {
                             messages.send(player, MessageKey.ADD_EMAIL_MESSAGE);
@@ -794,7 +795,7 @@ public class AuthMe extends JavaPlugin {
                     }
                 }
             }
-        }, 1, 1200 * Settings.delayRecall);
+        }, 1, 1200 * newSettings.getProperty(EmailSettings.DELAY_RECALL));
     }
 
     public String replaceAllInfo(String message, Player player) {
diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
index fcc64ab0e..d6f1f3278 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
@@ -175,7 +175,7 @@ public class AsynchronousLogin {
             displayOtherAccounts(auth);
 
             if (Settings.recallEmail && (StringUtils.isEmpty(email) || "your@email.com".equalsIgnoreCase(email))) {
-                m.send(player, MessageKey.EMAIL_ADDED_SUCCESS);
+                m.send(player, MessageKey.ADD_EMAIL_MESSAGE);
             }
 
             if (!Settings.noConsoleSpam) {
@@ -232,8 +232,8 @@ public class AsynchronousLogin {
         String message = "[AuthMe] " + StringUtils.join(", ", auths) + ".";
         for (Player player : Utils.getOnlinePlayers()) {
             if (plugin.getPermissionsManager().hasPermission(player, AdminPermission.SEE_OTHER_ACCOUNTS)
-            		|| (player.getName().equals(this.player.getName())
-            				&& plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OWN_ACCOUNTS))) {
+                    || (player.getName().equals(this.player.getName())
+                            && plugin.getPermissionsManager().hasPermission(player, PlayerPermission.SEE_OWN_ACCOUNTS))) {
                 player.sendMessage("[AuthMe] The player " + auth.getNickname() + " has " + auths.size() + " accounts");
                 player.sendMessage(message);
             }