diff --git a/fas/fas/cla.py b/fas/fas/cla.py
index 0206834..02a2184 100644
--- a/fas/fas/cla.py
+++ b/fas/fas/cla.py
@@ -99,13 +99,14 @@ class CLA(controllers.Controller):
         data = StringIO.StringIO(signature.file.read())
         plaintext = StringIO.StringIO()
         verified = False
-        ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+        keyid = re.sub('\s', '', person.gpg_keyid)
+        ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
         if ret != 0:
             turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
             turbogears.redirect('/cla/view/sign')
             return dict()
         #try:
-        #      subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+        #      subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
         #except subprocess.CalledProcessError:
         #    turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
         #    turbogears.redirect('/cla/view/sign')
@@ -121,7 +122,7 @@ class CLA(controllers.Controller):
                 if len(sigs):
                     sig = sigs[0]
                     # This might still assume a full fingerprint. 
-                    key = ctx.get_key(re.sub('\s', '', person.gpg_keyid))
+                    key = ctx.get_key(keyid)
                     fpr = key.subkeys[0].fpr
                     if sig.fpr != fpr:
                         turbogears.flash(_("Your signature's fingerprint did not match the fingerprint registered in FAS."))
diff --git a/fas/fas/user.py b/fas/fas/user.py
index f308492..9af9875 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -384,13 +384,14 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
                 # CLA one), think of how to make sure this doesn't get
                 # full of random keys (keep a clean Fedora keyring)
                 # TODO: MIME stuff?
-                ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+                keyid = re.sub('\s', '', person.gpg_keyid)
+                ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
                 if ret != 0:
                     turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
                     turbogears.redirect('/cla/view/sign')
                     return dict()
                 #try:
-                #    subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+                #    subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
                 #except subprocess.CalledProcessError:
                 #    turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
                 else:
@@ -401,7 +402,7 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
                         ctx.armor = True
                         signer = ctx.get_key(re.sub('\s', '', config.get('gpg_fingerprint')))
                         ctx.signers = [signer]
-                        recipient = ctx.get_key(re.sub('\s', '', person.gpg_keyid))
+                        recipient = ctx.get_key(keyid)
                         def passphrase_cb(uid_hint, passphrase_info, prev_was_bad, fd):
                             os.write(fd, '%s\n' % config.get('gpg_passphrase'))
                         ctx.passphrase_cb = passphrase_cb