diff --git a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
index 9fbd1414..0cda006a 100644
--- a/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
+++ b/src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
@@ -74,7 +74,7 @@ public class GuiCaptchaHandler implements Listener {
     Random howManyRandom = new Random();
     private boolean isPacketListenersActive = false;
 
-    int howLongIsRandomString;
+    private int howLongIsRandomString;
 
     public GuiCaptchaHandler() {
     }
@@ -123,6 +123,7 @@ public class GuiCaptchaHandler implements Listener {
             if (!whiteList.isEmpty()) {
                 String ip = getPlayerIp(playerunreg);
                 if (whiteList.contains(authmeApi.getCountryCode(ip)) && ip != null) {
+                    closeReasonMap.put(playerunreg, "verified");
                     return;
                 }
             }
diff --git a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
index 0b75c382..c665c8aa 100644
--- a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
+++ b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
@@ -4,6 +4,7 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.TeleportUtils;
 import org.bukkit.Location;
@@ -24,15 +25,17 @@ public class LoginLocationFixListener implements Listener {
     private AuthMe plugin;
     @Inject
     private Messages messages;
+    @Inject
+    private Settings settings;
     private final AuthMeApi authmeApi = AuthMeApi.getInstance();
 
     public LoginLocationFixListener() {
     }
 
     private static Material materialPortal = Material.matchMaterial("PORTAL");
-    private final boolean isSmartAsyncTeleport = AuthMe.settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT);
-    private final boolean isFixPortalStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL);
-    private final boolean isFixGroundStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND);
+    private final boolean isSmartAsyncTeleport = settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT);
+    private final boolean isFixPortalStuck = settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL);
+    private final boolean isFixGroundStuck = settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND);
     BlockFace[] faces = {BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.SOUTH_EAST, BlockFace.SOUTH_WEST, BlockFace.NORTH_EAST, BlockFace.NORTH_WEST};
 
     static {