diff --git a/terminus-ssh/src/api.ts b/terminus-ssh/src/api.ts
index 8fd2069d..f5800564 100644
--- a/terminus-ssh/src/api.ts
+++ b/terminus-ssh/src/api.ts
@@ -37,6 +37,7 @@ export interface SSHConnection {
     skipBanner?: boolean
     disableDynamicTitle?: boolean
     jumpHost?: string
+    agentForward?: boolean
 
     algorithms?: {[t: string]: string[]}
 }
diff --git a/terminus-ssh/src/components/editConnectionModal.component.pug b/terminus-ssh/src/components/editConnectionModal.component.pug
index 9470cca9..c0f9cc83 100644
--- a/terminus-ssh/src/components/editConnectionModal.component.pug
+++ b/terminus-ssh/src/components/editConnectionModal.component.pug
@@ -111,6 +111,11 @@
                         .title X11 forwarding
                     toggle([(ngModel)]='connection.x11')
 
+                .form-line
+                    .header
+                        .title Agent Forwarding
+                    toggle([(ngModel)]='connection.agentForward')
+
                 .form-line
                     .header
                         .title Tab color
diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts
index dcd7ebc3..bd7581ff 100644
--- a/terminus-ssh/src/services/ssh.service.ts
+++ b/terminus-ssh/src/services/ssh.service.ts
@@ -231,7 +231,7 @@ export class SSHService {
                     privateKey: privateKey || undefined,
                     tryKeyboard: true,
                     agent: agent || undefined,
-                    agentForward: (!session.connection.auth || session.connection.auth === 'agent') && !!agent,
+                    agentForward: session.connection.agentForward && !!agent,
                     keepaliveInterval: session.connection.keepaliveInterval,
                     keepaliveCountMax: session.connection.keepaliveCountMax,
                     readyTimeout: session.connection.readyTimeout,