diff --git a/NodeApp/src/managers/SessionManager.ts b/NodeApp/src/managers/SessionManager.ts
index 4f1d25d39af634dec36a96f95be22fd5591011c2..b5175f8598955b32b9a1d2a4b0404e716e422926 100644
--- a/NodeApp/src/managers/SessionManager.ts
+++ b/NodeApp/src/managers/SessionManager.ts
@@ -38,11 +38,11 @@ class LoginServer {
             if ( req.url?.match(Config.login.server.route) ) {
                 const urlParts = req.url.split('=');
                 if ( urlParts.length > 0 ) {
-                    this.events.emit('code', urlParts[1]);
-
                     res.writeHead(HttpStatusCode.Ok, { 'Content-Type': 'text/html' });
                     res.write(`<html lang="en"><body><h1 style="color: green">DojoCLI login successful</h1><h3>You can close this window.</h3></body></html>`);
                     res.end();
+                    
+                    this.events.emit('code', urlParts[1]);
                     return;
                 }
 
@@ -66,6 +66,7 @@ class LoginServer {
     stop() {
         try {
             this.server.close();
+            this.server.closeAllConnections();
             this.events.emit('stopped');
         } catch ( error ) {
             this.events.emit('error', error);