diff --git a/controller/AppController.py b/controller/AppController.py
index fcd96ee..c620961 100644
--- a/controller/AppController.py
+++ b/controller/AppController.py
@@ -32,9 +32,10 @@ class AppController:
             if message_id == Protocol.PARSE_SIGNOK:
                 self.window_controller.switch_connected_mode()
                 self.show_message("Connection done", False)
+                self.on_filelist()
             elif message_id == Protocol.PARSE_SIGNERROR:
                 self.show_message("Error during SIGN_IN / SIGN_UP", True)
-            self.on_filelist()
+                self.connection.close()
         except Exception as ex:
             print(ex)
             traceback.print_exc()
diff --git a/gui/MainWindow.py b/gui/MainWindow.py
index 16dfef2..e73ae59 100644
--- a/gui/MainWindow.py
+++ b/gui/MainWindow.py
@@ -11,10 +11,14 @@ class MainWindow:
         self.root.title("SecCon - © Louis SWINNEN 2022")
         self.root.config(bd=5)
         self.host = tk.StringVar()
+        self.host.set("127.0.0.1")
         self.passw = tk.StringVar()
+        self.passw.set("aaaaa")
         self.login = tk.StringVar()
+        self.login.set("aa")
         self.tls = tk.BooleanVar()
         self.port = tk.IntVar()
+        self.port.set(8500)
         self.draw_window()
 
     def start_main_loop(self):
diff --git a/net/UnicastConnection.py b/net/UnicastConnection.py
index a11ea9a..e854269 100644
--- a/net/UnicastConnection.py
+++ b/net/UnicastConnection.py
@@ -107,5 +107,11 @@ class UnicastConnection:
 
     def close(self):
         self.sock.close()
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.is_connected = False
+        self.is_tls = False
+        self.ssock = None
+        self.ca_path = None
+        self.ssl_info = None