diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index fefa772..c5a0793 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -18,6 +18,7 @@
 # ssh_config(5) man page.
 
  Host *
+    AddKeysToAgent yes
    ForwardAgent no
 #   ForwardX11 no
 #   PasswordAuthentication yes
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5799ab1..3adfb1a 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -54,7 +54,7 @@ ZSH_THEME="rkj-repos"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(archlinux common-aliases cp systemd colored-man-pages extract rsync history-substring-search nmap sudo systemadmin wakeonlan git zsh-256color tmux thefuck zsh-syntax-highlighting ssh-agent pip pyenv python docker)
+plugins=(archlinux common-aliases cp systemd colored-man-pages extract rsync history-substring-search nmap sudo systemadmin wakeonlan git zsh-256color tmux thefuck zsh-syntax-highlighting pip pyenv python docker)
 
 
 # User configuration