diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index dd239e2..0547b75 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -287,6 +287,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         ################
 		echo "$PIN" > "$PINFILE"
         echo "${IPFSPrivKey}" | gpg -q --output "$GPGPINFILE" --yes --pinentry-mode loopback --symmetric --passphrase-fd 0 "$PINFILE"
+        ./natools.py encrypt -p $NODE_G1PUBKEY -i "$PINFILE" -o "${PINFILE}.crypt"
         PIN=$(cat "$PINFILE" | xargs)
         [[ "$PIN" != "" ]] && echo "" > "$PINFILE" || log "SYSTEM ERROR :: PIN EMPTY !!! GPG???"
         
@@ -309,7 +310,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
     # TODO make decypher less stress on filesystem, use /tmp and ramdisk
     echo "${IPFSPrivKey}" | gpg -d -q --output "$PINFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGPINFILE"
     PIN=$(cat "$PINFILE" | xargs)
-    [[ "$PIN" == "" && -f "$PINFILE.$NODE_UIDNA.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$PINFILE.$NODE_UIDNA.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE");
+    [[ "$PIN" == "" ]] && [[ -f "${PINFILE}.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "${PINFILE}.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE");
     [[ "$PIN" != "" ]] && echo "" > "$PINFILE" || log "SYSTEM ERROR :: PIN EMPTY !!! GPG???"
 
     # HIDE EMAIL FILE
@@ -317,7 +318,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         log "__SUB:sms_INIT_ACCOUNT: DECODING EMAIL .gpg...  "
         echo "${IPFSPrivKey}" | gpg -d -q --output "$MAILFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGMAILFILE"
         MAIL=$(cat "$MAILFILE");
-        [[ $MAIL == "" && -f "$MAILFILE.node.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.node.crypt" -o "$MAILFILE" && MAIL=$(cat "$MAILFILE");
+        [[ $MAIL == "" ]] && [[ -f "$MAILFILE.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.crypt" -o "$MAILFILE" && MAIL=$(cat "$MAILFILE");
         # EMPTY CLEAR EMAIL FILE
         [[ $MAIL != ""  ]] && echo "" > "$MAILFILE" || log "SYSTEM ERROR :: MAIL EMPTY !!! GPG???"
     fi
diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh
index 833d3df..2fed7ad 100755
--- a/g1sms/sms_EMAIL.sh
+++ b/g1sms/sms_EMAIL.sh
@@ -28,11 +28,11 @@ fi
 
 if [[ "$mail" != "" ]]; then
     echo "$mail" > "$MAILFILE"
-    ./natools.py encrypt -p $NODE_G1PUBKEY -i "$MAILFILE" -o "$MAILFILE.node.crypt"
+    ./natools.py encrypt -p $NODE_G1PUBKEY -i "$MAILFILE" -o "$MAILFILE.crypt"
     echo "" > "$MAILFILE"
     log "__SUB:sms_EMAIL.sh.sh: EMAIL $MEMBER ($PHONE) NOUVEAU: $mail..."
 else
-    mail=$MAIL
+    mail="$MAIL"
 fi
 
 # SEND EMAIL WITH ssmtp