diff --git a/src/client/js.js b/src/client/js.js
index 3fc78bb..580b521 100644
--- a/src/client/js.js
+++ b/src/client/js.js
@@ -355,15 +355,24 @@ function join() {
         var redundant = false;
         var set = false;
         for (var i = 0; i < game.Players.length; i++) {
-            if (!set && game.Players[i].ID == "") {
-                game.Players[i] = {
-                    ID: id,
-                    Name: name,
-                    Participating: true,
+            if (!set && game.Players[i].ID == id) {
+                game.Players[i].Name = name
+                game.Players[i].Participating = true
+                set = true
+            }
+        }
+        if (!set) {
+            for (var i = 0; i < game.Players.length; i++) {
+                if (!set && game.Players[i].ID == "") {
+                    game.Players[i] = {
+                        ID: id,
+                        Name: name,
+                        Participating: true,
+                    }
+                    set = true;
+                } else {
+                    redundant = redundant || game.Players[i].ID == id;
                 }
-                set = true;
-            } else {
-                redundant = redundant || game.Players[i].ID == id;
             }
         }
         if (!set) {