diff --git a/README.md b/README.md
index 480bcdb..5c90338 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ The current state of maettleship is the following one
 - [X] End game (partially handled)
 - [X] Create an account and add it on the database
 - [X] Connection to your account
+- [X] Rematch 
 
 # TODO
 
@@ -73,7 +74,6 @@ Those point are the feature I still need to introduce
 
 - [ ] Security improvement (hashed password, sql injection handling)
 - [ ] Fix all the problems linked to my rooms implementation
-- [ ] Rematch 
 - [ ] Player historic (link to its account)
 - [ ] Global scoreboard
 - [ ] General error handling
diff --git a/index.js b/index.js
index 8ad50a2..435ecc8 100644
--- a/index.js
+++ b/index.js
@@ -202,11 +202,19 @@ io.on("connection", (socket) => {
 
     if (room == null) {
       callack({
-        status: false
+        status: false,
+        message: "No room for this code"
       })
       return 
     }
 
+    if (room.players.length >= 2) {
+      callack({
+        status: false,
+        message: "Room is full"
+      })
+    }
+
     callack({
       status: true
     })
diff --git a/public/scripts/app.js b/public/scripts/app.js
index 485e2c4..eb432cb 100644
--- a/public/scripts/app.js
+++ b/public/scripts/app.js
@@ -177,9 +177,7 @@ function onJoinRoom() {
     
     socket.emit("ask for room", roomKey, socket.id, (response) => {
       if (response.status !== true) {
-        if (errorHolder.textContent == "") {
-          errorHolder.append("Error : Room Id don't exist")
-        }
+        errorHolder.textContent = "Error : " + response.message
       } else {
         loader.style.display = "none";
         roomkeyHolder.innerHTML += `Your room key is : <strong>` + roomId + `</strong>`;