diff --git a/pom.xml b/pom.xml
index 83357ee..5b5e57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<properties>
 		<java.release>11</java.release>
-		<keycloak.version>10.0.0</keycloak.version>
+		<keycloak.version>21.1.2</keycloak.version>
 		<junit.version>5.7.0</junit.version>
 	</properties>
 
@@ -54,7 +54,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>keycloak-sha1</finalName>
+		<finalName>arte-keycloak-sha1-${version}</finalName>
 		<plugins>
 			<!-- Download source code in Eclipse, best practice -->
 			<plugin>
diff --git a/src/main/java/com/msalmi/SHA1HashProvider.java b/src/main/java/com/msalmi/SHA1HashProvider.java
index 22c01bc..21750cb 100644
--- a/src/main/java/com/msalmi/SHA1HashProvider.java
+++ b/src/main/java/com/msalmi/SHA1HashProvider.java
@@ -34,7 +34,7 @@ public PasswordCredentialModel encodedCredential(String rawPassword, int iterati
 	@Override
 	public boolean verify(String rawPassword, PasswordCredentialModel credential) {
 		String salt = new String(credential.getPasswordSecretData().getSalt(), java.nio.charset.StandardCharsets.UTF_8);
-		String encodedPassword = this.encode(salt + rawPassword, credential.getPasswordCredentialData().getHashIterations());
+		String encodedPassword = this.encode(rawPassword + salt, credential.getPasswordCredentialData().getHashIterations());
 		String hash = credential.getPasswordSecretData().getValue();
 		return encodedPassword.equals(hash);
 	}