diff --git a/pom.xml b/pom.xml
index 47b6bb2a..ecb05302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,12 +210,13 @@
 			<artifactId>javax.mail</artifactId>
 			<version>1.5.4</version>
 			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>activation</artifactId>
-					<groupId>javax.activation</groupId>
-				</exclusion>
-			</exclusions>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>javax.mail-api</artifactId>
+			<version>1.5.4</version>
+			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 1bceb5a5..5bdf0f4e 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
-import fr.xephi.authme.command.CommandHandler;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -37,15 +36,7 @@ import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.backup.JsonCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
-import fr.xephi.authme.commands.AdminCommand;
-import fr.xephi.authme.commands.CaptchaCommand;
-import fr.xephi.authme.commands.ChangePasswordCommand;
-import fr.xephi.authme.commands.ConverterCommand;
-import fr.xephi.authme.commands.EmailCommand;
-import fr.xephi.authme.commands.LoginCommand;
-import fr.xephi.authme.commands.LogoutCommand;
-import fr.xephi.authme.commands.RegisterCommand;
-import fr.xephi.authme.commands.UnregisterCommand;
+import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.converter.Converter;
 import fr.xephi.authme.converter.ForceFlatToSqlite;
 import fr.xephi.authme.datasource.CacheDataSource;
diff --git a/src/main/java/fr/xephi/authme/command/CommandDescription.java b/src/main/java/fr/xephi/authme/command/CommandDescription.java
index 018ac79b..be635d42 100644
--- a/src/main/java/fr/xephi/authme/command/CommandDescription.java
+++ b/src/main/java/fr/xephi/authme/command/CommandDescription.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.util.StringUtils;
-import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.util.StringUtils;
+
 @SuppressWarnings("UnusedDeclaration")
 public class CommandDescription {
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandHandler.java b/src/main/java/fr/xephi/authme/command/CommandHandler.java
index 1eb46ca0..f11ced44 100644
--- a/src/main/java/fr/xephi/authme/command/CommandHandler.java
+++ b/src/main/java/fr/xephi/authme/command/CommandHandler.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.help.HelpProvider;
+
 public class CommandHandler {
 
     /** The command manager instance. */
diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index ed139ed5..09aa84cf 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -1,10 +1,29 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.command.executable.*;
-import fr.xephi.authme.command.executable.authme.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import fr.xephi.authme.command.executable.HelpCommand;
+import fr.xephi.authme.command.executable.authme.AccountsCommand;
+import fr.xephi.authme.command.executable.authme.AuthMeCommand;
 import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.authme.FirstSpawnCommand;
+import fr.xephi.authme.command.executable.authme.ForceLoginCommand;
+import fr.xephi.authme.command.executable.authme.GetEmailCommand;
+import fr.xephi.authme.command.executable.authme.GetIpCommand;
+import fr.xephi.authme.command.executable.authme.LastLoginCommand;
+import fr.xephi.authme.command.executable.authme.PurgeBannedPlayersCommand;
+import fr.xephi.authme.command.executable.authme.PurgeCommand;
+import fr.xephi.authme.command.executable.authme.PurgeLastPositionCommand;
 import fr.xephi.authme.command.executable.authme.RegisterCommand;
+import fr.xephi.authme.command.executable.authme.ReloadCommand;
+import fr.xephi.authme.command.executable.authme.SetEmailCommand;
+import fr.xephi.authme.command.executable.authme.SetFirstSpawnCommand;
+import fr.xephi.authme.command.executable.authme.SetSpawnCommand;
+import fr.xephi.authme.command.executable.authme.SpawnCommand;
+import fr.xephi.authme.command.executable.authme.SwitchAntiBotCommand;
 import fr.xephi.authme.command.executable.authme.UnregisterCommand;
+import fr.xephi.authme.command.executable.authme.VersionCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
@@ -13,9 +32,6 @@ import fr.xephi.authme.command.executable.email.RecoverEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @SuppressWarnings("UnusedDeclaration")
 public class CommandManager {
 
diff --git a/src/main/java/fr/xephi/authme/command/CommandParts.java b/src/main/java/fr/xephi/authme/command/CommandParts.java
index 6f9f8559..732e9199 100644
--- a/src/main/java/fr/xephi/authme/command/CommandParts.java
+++ b/src/main/java/fr/xephi/authme/command/CommandParts.java
@@ -1,11 +1,11 @@
 package fr.xephi.authme.command;
 
-import fr.xephi.authme.util.ListUtils;
-import fr.xephi.authme.util.StringUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import fr.xephi.authme.util.ListUtils;
+import fr.xephi.authme.util.StringUtils;
+
 public class CommandParts {
 
     /** The list of parts for this command. */
diff --git a/src/main/java/fr/xephi/authme/command/CommandPermissions.java b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
index 3ebe5baa..7628ea44 100644
--- a/src/main/java/fr/xephi/authme/command/CommandPermissions.java
+++ b/src/main/java/fr/xephi/authme/command/CommandPermissions.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 //import com.timvisee.dungeonmaze.Core;
 //import com.timvisee.dungeonmaze.permission.PermissionsManager;
 import fr.xephi.authme.AuthMe;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @SuppressWarnings("UnusedDeclaration")
 public class CommandPermissions {
diff --git a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index 3ddcb5a5..831db024 100644
--- a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -1,9 +1,10 @@
 package fr.xephi.authme.command.executable;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.command.CommandSender;
 
 public class HelpCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
index fddf078a..aa8753c4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class AccountsCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
index 06f66fae..72ff623f 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/AuthMeCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class AuthMeCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
index 4e2a0c2a..d226a436 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -9,10 +14,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.security.NoSuchAlgorithmException;
 
 public class ChangePasswordCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
index 4cf5789d..99907080 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/FirstSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class FirstSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
index e4f285be..17c5d8a4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ForceLoginCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ForceLoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
index 76d5423c..1ed99ff9 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
 
 public class GetEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
index d67b7d63..61a4c2b6 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class GetIpCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
index 121a4c15..1cef6e56 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.Date;
+
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-
-import java.util.Date;
 
 public class LastLoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
index 32c2937c..ad966b44 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class PurgeBannedPlayersCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
index d207d34e..e2f855e6 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java
@@ -1,14 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.Calendar;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import java.util.Calendar;
-import java.util.List;
 
 public class PurgeCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
index e74e6651..c7ea009b 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeLastPositionCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class PurgeLastPositionCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
index 782cc787..7a51fd3c 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -8,10 +13,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.security.NoSuchAlgorithmException;
 
 public class RegisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
index 1d1dea02..cfc7b113 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java
@@ -1,15 +1,15 @@
 package fr.xephi.authme.command.executable.authme;
 
+//import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.Profiler;
-//import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class ReloadCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
index 900cd0b9..4715c00d 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class ResetNameCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
index ffe8d950..8011de24 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
@@ -1,5 +1,7 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,7 +9,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
 
 public class SetEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
index c51aa6f7..f8c469d7 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetFirstSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SetFirstSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
index ada37f41..7d65d666 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SetSpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SetSpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
index 4e68fb9f..250e9d2f 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SpawnCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Spawn;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class SpawnCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
index b3adf430..a9e34662 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/SwitchAntiBotCommand.java
@@ -1,11 +1,12 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.command.help.HelpProvider;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public class SwitchAntiBotCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
index e04b8889..176fda08 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterCommand.java
@@ -1,5 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scheduler.BukkitTask;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.Utils;
@@ -12,14 +21,6 @@ import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.MessageTask;
 import fr.xephi.authme.task.TimeoutTask;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scheduler.BukkitTask;
 
 public class UnregisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
index aaa823f4..e49b6115 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/VersionCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.authme;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.CommandParts;
-import fr.xephi.authme.command.ExecutableCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.ExecutableCommand;
+
 public class VersionCommand extends ExecutableCommand {
 
     /**
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 0b2d6371..81f4c50f 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
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.captcha;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class CaptchaCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
index bebba5b4..20649792 100644
--- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.changepassword;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.task.ChangePasswordTask;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ChangePasswordCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
index 42e599f8..a593dc3a 100644
--- a/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/converter/ConverterCommand.java
@@ -1,13 +1,21 @@
 package fr.xephi.authme.command.executable.converter;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import fr.xephi.authme.converter.*;
+import fr.xephi.authme.converter.Converter;
+import fr.xephi.authme.converter.CrazyLoginConverter;
+import fr.xephi.authme.converter.FlatToSql;
+import fr.xephi.authme.converter.FlatToSqlite;
+import fr.xephi.authme.converter.RakamakConverter;
+import fr.xephi.authme.converter.RoyalAuthConverter;
+import fr.xephi.authme.converter.SqlToFlat;
+import fr.xephi.authme.converter.vAuthConverter;
+import fr.xephi.authme.converter.xAuthConverter;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ConverterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
index 3fa8e0f2..f91e6a24 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java
@@ -1,5 +1,8 @@
 package fr.xephi.authme.command.executable.email;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,8 +10,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class AddEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
index aad9bc22..b7f71736 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/ChangeEmailCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.email;
 
+import java.util.Arrays;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
@@ -7,10 +12,6 @@ import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Arrays;
 
 public class ChangeEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
index 13628f90..26e74165 100644
--- a/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/email/RecoverEmailCommand.java
@@ -1,5 +1,10 @@
 package fr.xephi.authme.command.executable.email;
 
+import java.security.NoSuchAlgorithmException;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.cache.auth.PlayerAuth;
@@ -10,10 +15,6 @@ import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.security.NoSuchAlgorithmException;
 
 public class RecoverEmailCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
index 22b57dcd..edb34910 100644
--- a/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/login/LoginCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.login;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class LoginCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
index 95b5ab9c..0dfcbaf4 100644
--- a/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/logout/LogoutCommand.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.executable.logout;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class LogoutCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
index b08190fc..45e3c470 100644
--- a/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
@@ -1,13 +1,14 @@
 package fr.xephi.authme.command.executable.register;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.security.RandomString;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class RegisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
index 20055203..66af5abc 100644
--- a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java
@@ -1,12 +1,13 @@
 package fr.xephi.authme.command.executable.unregister;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.settings.Messages;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class UnregisterCommand extends ExecutableCommand {
 
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
index 17aeb163..4f28eb29 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java
@@ -1,19 +1,20 @@
 package fr.xephi.authme.command.help;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.command.CommandPermissions;
 import fr.xephi.authme.util.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 public class HelpPrinter {
 
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index 000f721e..4cf27c6d 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -1,10 +1,13 @@
 package fr.xephi.authme.command.help;
 
-import fr.xephi.authme.AuthMe;
-import fr.xephi.authme.command.*;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+import fr.xephi.authme.AuthMe;
+import fr.xephi.authme.command.CommandDescription;
+import fr.xephi.authme.command.CommandParts;
+import fr.xephi.authme.command.FoundCommandResult;
+
 public class HelpProvider {
 
     /**
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
index 492a4f14..b2c40875 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpSyntaxHelper.java
@@ -1,10 +1,11 @@
 package fr.xephi.authme.command.help;
 
+import org.bukkit.ChatColor;
+
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
 import fr.xephi.authme.command.CommandParts;
 import fr.xephi.authme.util.ListUtils;
-import org.bukkit.ChatColor;
 
 public class HelpSyntaxHelper {