diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts
index 6576b1dd..d59f8225 100644
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -420,7 +420,9 @@ export class SSHService {
         let host = query
         let port = 22
         if (host.includes('@')) {
-            [user, host] = host.split('@')
+            const parts = host.split(/@/g)
+            host = parts[parts.length - 1]
+            user = parts.slice(0, parts.length - 1).join('@')
         }
         if (host.includes(':')) {
             port = parseInt(host.split(':')[1])