1 files changed, 6 insertions, 2 deletions
diff --git a/firma b/firma
index 360228f..4a6e3e9 100755
--- a/firma
+++ b/firma
@@ -1490,8 +1490,12 @@ function SubscribeUsers {
       if [ -z "$3" ]; then
         keyserver="$KEYSERVER"
       else
-        keyserver="$2"
-        shift
+        if ! CheckValidEmail $2; then
+          keyserver="$2"
+          shift
+        else
+          keyserver="$KEYSERVER"
+        fi
       fi
       if CheckValidEmail $2; then
         method="--search-keys"