diff --git a/Lab_3/Twidder/server.py b/Lab_3/Twidder/server.py
index e759f95dbaa73b55bf6933064a146f6e226861fb..48c063659d13f34b29c6c693819187d1edbf3ee0 100644
--- a/Lab_3/Twidder/server.py
+++ b/Lab_3/Twidder/server.py
@@ -100,6 +100,7 @@ def echo(socket):
 
         # Put socket in global dict so server knows my connection is open
         signedInUser[myEmail] = socket
+        print(signedInUser)
         socket.send(json.dumps({"action" : "signIn"}))
     
 
diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js
index db7a5be60ae3219872b5a551ddfb91aaf2ede150..de96a87139bf55d8f9be68ecf0a3eaec924b7b68 100644
--- a/Lab_3/Twidder/static/client.js
+++ b/Lab_3/Twidder/static/client.js
@@ -14,11 +14,16 @@ function connectWithSocket() {
     let token = localStorage.getItem("currentUser");
             
     // Changes the view to profile view and loads user info
-    document.getElementById("error").innerHTML = "You are signed in";
+    // document.getElementById("error").innerHTML = "You are signed in";
     displayView();
     setUserDetails("home");
 
     // Establish web socket
+    // if (socket.readyState !== WebSocket.CLOSED) {
+    //     socket.close();
+    // }
+    // socket.close();
+
     socket = new WebSocket('ws://' + document.domain + ':5000/myServer/api');
     socket.onopen = function (event) {
         let myEmail = localStorage.getItem("homeEmail");
@@ -33,8 +38,9 @@ function connectWithSocket() {
         console.log("Nu fick jag svar"); 
         switch (response["action"]) {
             case "signOut":
+                socket.close();
                 console.log(response);
-                
+                // hej
                 // Reset token in the localStorage
                 localStorage.setItem("currentUser", "");
                 localStorage.setItem("homeEmail", "");
@@ -351,9 +357,9 @@ displayView = function(){
 window.onload = function () {
 
     // Delete when done - används för att hoppa tillbaka till rtt view under utveckling
-    localStorage.setItem("currentUser", "");
-    localStorage.setItem("homeEmail", "");
-    localStorage.setItem("browseEmail", "");
+    // localStorage.setItem("currentUser", "");
+    // localStorage.setItem("homeEmail", "");
+    // localStorage.setItem("browseEmail", "");
 
     // All key/value pairs stored in out localStorage
     // If first time? check this:
@@ -364,21 +370,23 @@ window.onload = function () {
     if (localStorage.getItem("currentUser") == null)
         localStorage.setItem("currentUser", "");
     
-    // Todo - problem    
-    if (localStorage.getItem("currentUser") != "")
-        connectWithSocket();
-
     // Initialize div objects (global variables)
     welcomeDiv = document.getElementById("welcomeview");
     profileDiv = document.getElementById("profileview");
     windowDiv = document.getElementById("windowDiv");
+    
+    if (localStorage.getItem("currentUser") != "") {//if logged in
+        connectWithSocket();
+    }
+    else {
+        // Set correct view depending on if someone is signed in or not
+        displayView();
 
-    // Set correct view depending on if someone is signed in or not
-    displayView();
+        // Load user details to home page and browse page
+        // setUserDetails("home");
+        // setUserDetails("browse");
+    }
 
-    // Load user details to home page and browse page
-    setUserDetails("home");
-    setUserDetails("browse");
 };
 
 // Function for setting user details, either for yourself or for some other user