diff --git a/vpn/client/DapCmdHandlers/DapCmdConnect.cpp b/vpn/client/DapCmdHandlers/DapCmdConnect.cpp
index 241164c2552e567408491f1ba9b08fb88e633adf..fe9b4ffd0ac246df7614f06661d5d439679b2bbe 100644
--- a/vpn/client/DapCmdHandlers/DapCmdConnect.cpp
+++ b/vpn/client/DapCmdHandlers/DapCmdConnect.cpp
@@ -80,17 +80,15 @@ void DapCmdConnect::handle(const QJsonObject* params)
     }
 
     bool updateRouteTable = mandatoryConnParams[UPDATE_ROUTE_TABLE].toBool(true);
-    QString serialKey;
+    QString serialKey = "";
 
     if (params->contains("serial")) {
         serialKey = params->value("serial").toString().remove('-');
-        if (serialKey.isEmpty()) {
-            serialKey = DapServiceDataLocal::instance()->serialKeyData()->serialKey().remove('-');
-        }
-    } else {
+    }
+
+    if (serialKey.isEmpty()) {
         serialKey = DapServiceDataLocal::instance()->serialKeyData()->serialKey().remove('-');
     }
-    serialKey = QString(DapServiceDataLocal::instance()->serialKeyData()->serialKey()).remove('-');
 
     uint16_t port = uint16_t(mandatoryConnParams[PORT_KEY].toInt());
     QString address = mandatoryConnParams[ADDRESS_KEY].toString();
@@ -101,7 +99,7 @@ void DapCmdConnect::handle(const QJsonObject* params)
     if (!serialKey.isEmpty()) {
         emit sigConnect(serialKey, "", "", address, port, updateRouteTable);
     } else {
-        emit sigConnectNoAuth(address, port);
+        sendCmdError("No serial key provided");
     }
 }
 
diff --git a/vpn/client/DapCmdHandlers/DapCmdResetSerialKey.cpp b/vpn/client/DapCmdHandlers/DapCmdResetSerialKey.cpp
index 973e4a20495352c4d331c93247ea46666a5b55dd..8b4d7f64103dc703b44ec63936c287590f31be78 100644
--- a/vpn/client/DapCmdHandlers/DapCmdResetSerialKey.cpp
+++ b/vpn/client/DapCmdHandlers/DapCmdResetSerialKey.cpp
@@ -7,14 +7,17 @@ DapCmdResetSerialKey::DapCmdResetSerialKey(QObject *parent)
 
 void DapCmdResetSerialKey::handle(const QJsonObject *params)
 {
+    qDebug() << "Handling reset serial key command...";
     DapCmdServiceAbstract::handle(params);
 
     connect(this, &DapCmdResetSerialKey::sigResetSerialKeyReplied, [&] (const QString& reply) {
+        qDebug() << "Received signal: sigResetSerialKeyReplied with reply:" << reply;
         QJsonObject l_obj;
         l_obj["reset_reply"] = reply;
         sendCmd(&l_obj);
     });
 
+    qDebug() << "Emitting sigResetRequestSent signal...";
     emit sigResetRequestSent();
 }