diff --git a/client/main.cpp b/client/main.cpp
index 13db2dc..fd20bb9 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -41,11 +41,12 @@ int main(int argc, char *argv[])
     parser.process(a);
     // Initialize the logger
     init_logger();
-    SPDLOG_INFO("Starting GUI");
 
-    QString host = parser.value(hostOption);
-    uint16_t port = parser.value(portOption).toUShort();
-    MainWindow w(host, port);
+    QUrl url;
+    url.setScheme("ws");
+    url.setHost(parser.value(hostOption));
+    url.setPort(parser.value(portOption).toInt());
+    MainWindow w(url);
     w.show();
     return a.exec();
 }
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index a0ceb0f..8244993 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -6,9 +6,9 @@
 #include "scope_mux_tester.hpp"
 #include "test.hpp"
 
-MainWindow::MainWindow(QString host, uint16_t port, QWidget *parent)
+MainWindow::MainWindow(QUrl ws_url, QWidget *parent)
     : QMainWindow(parent), ui(new Ui::MainWindow),
-      m_web_socket(new Web_socket_wrapper(QUrl("ws://" + host + ":" + QString::number(port)), this)),
+      m_web_socket(new Web_socket_wrapper(ws_url)),
       m_error_dialog(new NetworkError(this)), m_sims{{"Can_Debugger", new Can_Debugger(m_web_socket, this)},
                                                      {"Scope_Mux_Tester", new Scope_Mux_Tester(m_web_socket, this)},
                                                      {"CVS_I10", new CVS_I10(m_web_socket, this)},
@@ -18,7 +18,7 @@ MainWindow::MainWindow(QString host, uint16_t port, QWidget *parent)
     this->setWindowTitle("Simulator Selector");
 
     m_error_dialog->set_error("Connection timed out\nCheck if the server is running");
-    ui->connection->setText("Connected to ws://" + host + ":" + QString::number(port));
+    ui->connection->setText("Connected to " + ws_url.toString());
     // Default sim
     // defaultSim("CVS_I10");
 
diff --git a/client/mainwindow.h b/client/mainwindow.h
index 9aa3d7d..6f5df34 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.h
@@ -17,7 +17,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
   public:
-    explicit MainWindow(QString host, uint16_t port, QWidget *parent = nullptr);
+    explicit MainWindow(QUrl ws_url, QWidget *parent = nullptr);
     ~MainWindow();
 
     void defaultSim(QString name);