diff --git a/zsh/func/connect_ssh_agent b/zsh/func/connect_ssh_agent
index 5525249..e762eb1 100644
--- a/zsh/func/connect_ssh_agent
+++ b/zsh/func/connect_ssh_agent
@@ -1,12 +1,17 @@
 #!/usr/bin/env zsh
 # Eryn Wells <eryn@erynwells.me>
 
-# Start SSH agent for password-less logins
-if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
-    if ! pgrep -u $USER ssh-agent 1>/dev/null; then
-        eval $(ssh-agent -s > ~/.ssh_agent_vars)
-        trap "kill $SSH_AGENT_PID" 0
-    else
-        eval $(cat ~/.ssh_agent_vars)
+function connect_ssh_agent
+{
+    # Start SSH agent for password-less logins
+    if [[ -z "$SSH_AUTH_SOCK" && -x "$SSHAGENT" ]]; then
+        if ! pgrep -u $USER ssh-agent 1>/dev/null; then
+            eval $(ssh-agent -s > ~/.ssh_agent_vars)
+            trap "kill $SSH_AGENT_PID" 0
+        else
+            eval $(cat ~/.ssh_agent_vars)
+        fi
     fi
-fi
+}
+
+connect_ssh_agent "$@"