diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user
index 692f049ba98a00666d35db890987bf45af31ddb8..d916703a0a3239d1c9c1d70a4dcb7378d84b262a 100755
--- a/src/freedombone-controlpanel-user
+++ b/src/freedombone-controlpanel-user
@@ -415,8 +415,8 @@ function block_unblock_subject {
 }
 
 function show_gpg_key {
-    GPG_FINGERPRINT=$(gpg --fingerprint $MY_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
-    GPG_DATE=$(gpg --fingerprint $MY_EMAIL_ADDRESS | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}')
+    GPG_FINGERPRINT=$(gpg --fingerprint $GPG_ID | sed -n '2p' | sed 's/^[ \t]*//')
+    GPG_DATE=$(gpg --fingerprint $GPG_ID | grep -i "pub" | head -n 1 | awk -F ' ' '{print $3}')
     dialog --title $"My PGP/GPG Key" \
            --backtitle $"Freedombone User Control Panel" \
            --msgbox $"Email Address: $MY_EMAIL_ADDRESS\n\nKey ID: $GPG_ID\n\nFingerprint: $GPG_FINGERPRINT\n\nCreated: $GPG_DATE" 12 70