diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index f99cb223..19dfd8be 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -33,7 +33,7 @@ class ConnectionManager {
 
             const room = new Room(window.location.pathname + window.location.hash);
             return Promise.resolve(room);
-        } else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
+        } else if (connexionType === GameConnexionTypes.organization || connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
             const localUser = localUserStore.getLocalUser();
 
             if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) {
@@ -57,18 +57,6 @@ class ConnectionManager {
             }
             const room = new Room(roomId);
             return Promise.resolve(room);
-        } else if (connexionType == GameConnexionTypes.organization) {
-            const localUser = localUserStore.getLocalUser();
-
-            if (localUser) {
-                this.localUser = localUser;
-                await this.verifyToken(localUser.jwtToken);
-                const room = new Room(window.location.pathname + window.location.hash);
-                return Promise.resolve(room);
-            } else {
-                //todo: find some kind of fallback?
-                return Promise.reject('Could not find a user in localstorage');
-            }
         }
 
         return Promise.reject('Invalid URL');
diff --git a/front/src/Phaser/Login/EntryScene.ts b/front/src/Phaser/Login/EntryScene.ts
index fec4e880..6a91be1f 100644
--- a/front/src/Phaser/Login/EntryScene.ts
+++ b/front/src/Phaser/Login/EntryScene.ts
@@ -31,7 +31,8 @@ export class EntryScene extends Scene {
     create() {
         gameManager.init(this.scene).then(() => {
             this.scene.start(LoginSceneName);
-        }).catch(() => {
+        }).catch((err) => {
+            console.error(err)
             this.scene.start(FourOFourSceneName, {
                 url: window.location.pathname.toString()
             });