diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 4a752614..430ac5d3 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1396,6 +1396,9 @@ function configure_gpg {
 
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
 
+    gpg_agent_setup root
+    gpg_agent_setup $MY_USERNAME
+
     if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
         echo '' >> $gpg_dir/gpg.conf
         echo '# default preferences' >> $gpg_dir/gpg.conf
@@ -1456,8 +1459,6 @@ function configure_gpg {
         chmod 700 /root/.gnupg
         chmod 600 /root/.gnupg/*
     fi
-    gpg_agent_setup root
-    gpg_agent_setup $MY_USERNAME
 
     mark_completed $FUNCNAME
 }