diff --git a/pom.xml b/pom.xml
index 27decf8b8..ba5548893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,13 +110,13 @@
 					</execution>
 				</executions>
 			</plugin>
-    			<plugin>
+			<plugin>
 				<groupId>com.versioneye</groupId>
 				<artifactId>versioneye-maven-plugin</artifactId>
 				<version>3.5.1</version>
 				<configuration>
 					<projectId>55bab9e8653762002000190a</projectId>
-					<!--<apiKey>my_secret_api_key</apiKey>-->>
+					<!--<apiKey>my_secret_api_key</apiKey> -->
 				</configuration>
 			</plugin>
 		</plugins>
@@ -178,6 +178,12 @@
 			<url>http://ci.xephi.fr/plugin/repository/everything/</url>
 		</repository>
 
+		<!-- Metrics Snapshots Repo -->
+		<repository>
+			<id>mcstats-snapshots</id>
+			<url>http://repo.mcstats.org/content/repositories/snapshots/</url>
+		</repository>
+
 	</repositories>
 
 	<dependencies>
@@ -233,10 +239,11 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- Metrics API -->
 		<dependency>
 			<groupId>org.mcstats.bukkit</groupId>
 			<artifactId>metrics</artifactId>
-			<version>R7</version>
+			<version>R8-SNAPSHOT</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
diff --git a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
index 5cfa87f07..847e99518 100644
--- a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
+++ b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
@@ -395,7 +395,7 @@ public class BCRYPT implements EncryptionMethod {
             off = 3;
         else {
             minor = salt.charAt(2);
-            if (minor != 'a' || salt.charAt(3) != '$')
+            if (minor < 'a' || minor > 'z' || salt.charAt(3) != '$')
                 throw new IllegalArgumentException("Invalid salt revision");
             off = 4;
         }
diff --git a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java
index ad7eb62ac..2c1ae57a1 100644
--- a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java
+++ b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT2Y.java
@@ -15,7 +15,7 @@ public class BCRYPT2Y implements EncryptionMethod {
     @Override
     public boolean comparePassword(String hash, String password,
             String playerName) throws NoSuchAlgorithmException {
-        String ok = hash.substring(29);
+        String ok = hash.substring(0, 29);
         if (ok.length() != 29)
             return false;
         return hash.equals(getHash(password, ok, playerName));