diff --git a/src/freedombone b/src/freedombone
index dff2ba3b..288b730f 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -7476,6 +7476,9 @@ function configure_gpg {
   chmod 600 /home/$MY_USERNAME/.gnupg/*
 
   if [[ $MY_GPG_PUBLIC_KEY && $MY_GPG_PRIVATE_KEY ]]; then
+      echo "Public key:  $MY_GPG_PUBLIC_KEY"
+      echo "Private key: $MY_GPG_PRIVATE_KEY"
+
       # use your existing GPG keys which were exported
       if [ ! -f $MY_GPG_PUBLIC_KEY ]; then
           echo "GPG public key file $MY_GPG_PUBLIC_KEY was not found"
diff --git a/src/freedombone-config b/src/freedombone-config
index 59372ea8..4607ed06 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -474,9 +474,12 @@ function interactive_gpg {
             255) exit 2;;
         esac
         case $(cat $data) in
-            1) return;;
+            1) if [ -d /home/$MY_USERNAME/.gnupg ]; then
+				   rm -rf /home/$MY_USERNAME/.gnupg
+			   fi
+			   break;;
             2) interactive_gpg_from_usb
-               return;;
+               break;;
             3) interactive_gpg_from_remote
                if [ ! "$?" = "0" ]; then
                    GPG_CONFIGURED="no"