diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 24568e797e8ffa4304bb615a0d657a8fdfc9774f..a113d502110c236b72b3b318bf1aadf4e4ed7f45 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -119,9 +119,14 @@ fi
 # generate a gpg key
 echo "Making a GPG key for $ADD_USERNAME@$HOSTNAME"
 mkdir "/home/$ADD_USERNAME/.gnupg"
-{ echo "keyserver $GPG_KEYSERVER";
-  echo 'keyserver hkps://hkps.pool.sks-keyservers.net';
-  echo 'keyserver-options auto-key-retrieve';
+if [[ "$GPG_KEYSERVER" != 'hkps://hkps.pool.sks-keyservers.net' ]]; then
+    { echo "keyserver $GPG_KEYSERVER";
+      echo 'keyserver hkps://hkps.pool.sks-keyservers.net'; } >> "/home/$ADD_USERNAME/.gnupg/gpg.conf"
+else
+      echo 'keyserver hkps://hkps.pool.sks-keyservers.net' >> "/home/$ADD_USERNAME/.gnupg/gpg.conf"
+fi
+
+{ echo 'keyserver-options auto-key-retrieve';
   echo '';
   echo '# default preferences';
   echo 'personal-digest-preferences SHA256';