diff --git a/dot_bash_profile b/dot_bash_profile
index a6a32c5..11387ff 100644
--- a/dot_bash_profile
+++ b/dot_bash_profile
@@ -8,3 +8,5 @@ export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 
 export XDG_DATA_HOME="$HOME/.local/share"
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export SSH_ASKPASS="/usr/bin/ksshaskpass"
+export SSH_ASKPASS_REQUIRE=prefer
diff --git a/dot_zshenv.tmpl b/dot_zshenv.tmpl
index e336b50..967ce73 100644
--- a/dot_zshenv.tmpl
+++ b/dot_zshenv.tmpl
@@ -10,3 +10,6 @@ export GOPATH="$XDG_DATA_HOME"/go
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export CARGO_HOME="$XDG_DATA_HOME"/cargo
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+
+export SSH_ASKPASS="/usr/bin/ksshaskpass"
+export SSH_ASKPASS_REQUIRE=prefer
diff --git a/private_dot_config/systemd/user/ssh-agent.service b/private_dot_config/systemd/user/ssh-agent.service
new file mode 100644
index 0000000..9428410
--- /dev/null
+++ b/private_dot_config/systemd/user/ssh-agent.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH key agent
+
+[Service]
+Type=simple
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target
diff --git a/private_dot_ssh/config b/private_dot_ssh/config
index c76a98e..f6e55bc 100644
--- a/private_dot_ssh/config
+++ b/private_dot_ssh/config
@@ -8,10 +8,13 @@ Host codereview.qt-project.org
     User redstrate
     PreferredAuthentications publickey
     IdentityFile ~/.ssh/id_rsa
+    AddKeysToAgent  yes
 
 Host codereview.kdab.com
     User joshua.goins
     Port 29418
+    AddKeysToAgent  yes
 
 Host ryne.moe
     Port 38901
+    AddKeysToAgent  yes