diff --git a/.classpath b/.classpath
index a657be2..485f6dc 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="json-simple-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="mysql-connector-java-8.0.28.jar"/>
+	<classpathentry exported="true" kind="lib" path="password4j-1.6.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
index 6143027..cfcad73 100644
--- a/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
+++ b/src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
@@ -12,7 +12,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DatabaseRepo {
+public class DatabaseRepository {
 	private static final String SPECIFIC_PUZZLE_QUERY = "SELECT * FROM puzzles WHERE id_puzzle = ?";
 	private static final String SPECIFIC_CHAPTER_QUERY = "SELECT * FROM chapters WHERE id_chapter = ?";
 	private static final String PUZZLES_IN_CHAPTER_QUERY = "SELECT * FROM puzzles WHERE fk_chapter = ?";
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Login.java b/src/be/jeffcheasey88/peeratcode/routes/Login.java
index 47ba762..26aa670 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Login.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Login.java
@@ -13,9 +13,9 @@ import be.jeffcheasey88.peeratcode.webserver.Response;
 
 public class Login implements Response {
 
-	private final DatabaseRepo databaseRepo;
+	private final DatabaseRepository databaseRepo;
 
-	public Login(DatabaseRepo databaseRepo) {
+	public Login(DatabaseRepository databaseRepo) {
 		this.databaseRepo = databaseRepo;
 	}
 
@@ -26,13 +26,12 @@ public class Login implements Response {
 		if (informations != null) {
 			String pseudo = (String) informations.get("pseudo");
 			String password = (String) informations.get("passwd");
-			boolean wellLogged = databaseRepo.login(pseudo, password);
-			if (!wellLogged) {
-				HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
-			} else {
+			if (databaseRepo.login(pseudo, password)) {
 				HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
+				return;
 			}
 		}
+		HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
 	}
 
 	@Override
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Register.java b/src/be/jeffcheasey88/peeratcode/routes/Register.java
index 36c5556..dc79377 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Register.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Register.java
@@ -13,9 +13,9 @@ import be.jeffcheasey88.peeratcode.webserver.Response;
 
 public class Register implements Response {
 
-	private final DatabaseRepo databaseRepo;
+	private final DatabaseRepository databaseRepo;
 
-	public Register(DatabaseRepo databaseRepo) {
+	public Register(DatabaseRepository databaseRepo) {
 		this.databaseRepo = databaseRepo;
 	}
 
@@ -44,22 +44,20 @@ public class Register implements Response {
 			boolean pseudoAvailable = databaseRepo.checkPseudoAvailability(pseudo);
 			boolean emailAvailable = databaseRepo.checkEmailAvailability(email);
 			if (pseudoAvailable && emailAvailable) {
-				boolean wellRegistered = databaseRepo.register(pseudo, email, password, firstname, lastname, description, group, avatar);
-				if (!wellRegistered) {
-					HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
-					writer.write("Error while registering");
-				} else {
+				if (databaseRepo.register(pseudo, email, password, firstname, lastname, description, group, avatar)){
 					HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
-					writer.write("OK");
+					return;
 				}
 			} else {
-				HttpUtil.responseHeaders(writer, 200, "Access-Control-Allow-Origin: *");
+				HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
 				JSONObject error = new JSONObject();
 				error.put("username_valid", pseudoAvailable);
 				error.put("email_valid", emailAvailable);
 				writer.write(error.toJSONString());
+				return;
 			}
 		}
+		HttpUtil.responseHeaders(writer, 403, "Access-Control-Allow-Origin: *");
 	}
 
 	@Override