diff --git a/pom.xml b/pom.xml
index 1cead950..4fb68198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,14 @@
                     <include>plugin.yml</include>
                 </includes>
             </resource>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>email.html</include>
+                </includes>
+            </resource>
             <resource>
                 <targetPath>.</targetPath>
                 <filtering>false</filtering>
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index e49215b3..337e13ec 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -229,7 +229,7 @@ public class AuthMePlayerListener implements Listener {
         if (auth != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(event.getName())) {
             event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
             event.setKickMessage("You should join using username: " + ChatColor.AQUA + auth.getRealName() +
-                ChatColor.RESET + "\nnot :" + ChatColor.RED + event.getName()); // TODO: write a better message
+                ChatColor.RESET + "\nnot: " + ChatColor.RED + event.getName()); // TODO: write a better message
             return;
         }
 
@@ -288,7 +288,7 @@ public class AuthMePlayerListener implements Listener {
                     pl.kickPlayer(m.retrieveSingle(MessageKey.KICK_FOR_VIP));
                     event.allow();
                 } else {
-                    ConsoleLogger.info("The player " + event.getPlayer().getName() + " tryed to join, but the server was full");
+                    ConsoleLogger.info("The player " + event.getPlayer().getName() + " tried to join, but the server was full");
                     event.setKickMessage(m.retrieveSingle(MessageKey.KICK_FULL_SERVER));
                     event.setResult(PlayerLoginEvent.Result.KICK_FULL);
                 }
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index 668c0e3d..fb102ec9 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -141,8 +141,10 @@ public class AsyncRegister {
             return;
         }
         if (!Settings.forceRegLogin) {
-            PlayerCache.getInstance().addPlayer(auth);
-            database.setLogged(name);
+            //PlayerCache.getInstance().addPlayer(auth);
+            //database.setLogged(name);
+            // TODO: check this...
+            plugin.getManagement().performLogin(player, "dontneed", true);
         }
         plugin.otherAccounts.addPlayer(player.getUniqueId());
         ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin);