diff --git a/pom.xml b/pom.xml
index 87feaae49..da80a0d88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
 		<!-- EssentialsX Repo -->
 		<repository>
 			<id>ess-repo</id>
-			<url>https://ci.drtshock.net/plugin/repository/everything</url>
+			<url>http://ci.drtshock.net/plugin/repository/everything</url>
 		</repository>
 
 		<!-- CombatTagPlus Repo -->
@@ -257,7 +257,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
+		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project,
 			http://bukkit.org/ -->
 		<dependency>
 			<groupId>org.bukkit</groupId>
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
index 255c696d5..cc516697b 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
@@ -67,14 +67,10 @@ public class AsyncronousRegister {
             allowRegister = false;
         }
 
-        else if (!Settings.unsafePasswords.isEmpty()) {
-            if (Settings.unsafePasswords.contains(password.toLowerCase())) {
-                m.send(player, "password_error_unsafe");
-                allowRegister = false;
-            }
-        }
-
-        else if (database.isAuthAvailable(name)) {
+        else if (!Settings.unsafePasswords.isEmpty() && Settings.unsafePasswords.contains(password.toLowerCase())) {
+            m.send(player, "password_error_unsafe");
+            allowRegister = false;
+        } else if (database.isAuthAvailable(name)) {
             m.send(player, "user_regged");
             allowRegister = false;
         }