diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 5b6fffdb..1f1b593c 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -304,7 +304,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
             if [[ ${APPNAME} == "logout" ]]; then
 
                 ## REMOVE PLAYER IPNS KEY FROM STATION
-                [[ "${salt}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
+                [[ "${salt}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
                 && PLAYER=${salt} \
                 || PLAYER=${WHAT}
 
@@ -324,7 +324,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
 
             if [[ ${APPNAME} == "login" ]]; then
 
-                [[ "${salt}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
+                [[ "${salt}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
                 && PLAYER=${salt} \
                 || PLAYER=${WHAT}
 
@@ -538,7 +538,7 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
             [[ ${DESTMAIL} == "" || ${DESTMAIL} == "undefined" ]] && echo "<br> Missing Destination EMAIL <br>" >> ~/.zen/tmp/${MOATS}/disco
 
             ## CHECK VALID EMAIL FORMAT
-            [[ "${DESTMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
+            [[ "${DESTMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
                 &&  echo "<br> GOOD $DESTMAIL <br>" >> ~/.zen/tmp/${MOATS}/disco \
                 && GOMAIL=1
 
diff --git a/API/SALT.sh b/API/SALT.sh
index 44897ef5..f1079db3 100755
--- a/API/SALT.sh
+++ b/API/SALT.sh
@@ -145,7 +145,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/
                 [[ ! ${EMAIL} ]] && (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR ${WHAT} CONTACT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) &&  echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. &&  exit 0
 
                 ## CHECK WHAT IS EMAIL
-                if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
+                if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
                     echo "VALID EMAIL OK"
                 else
                     echo "BAD EMAIL"
@@ -434,7 +434,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
         if [[ $APPNAME == "login" ]]; then
 
             ## INSTALL PLAYER IPNS KEY ON STATION
-            [[ "${SALT}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
+            [[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
             && PLAYER=${SALT} \
             || PLAYER=${WHAT}
 
@@ -473,7 +473,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
         if [[ $APPNAME == "logout" ]]; then
 
             ## REMOVE PLAYER IPNS KEY FROM STATION
-            [[ "${SALT}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
+            [[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
             && PLAYER=${SALT} \
             || PLAYER=${WHAT}
 
diff --git a/API/UPLANET.sh b/API/UPLANET.sh
index b597c931..fb403ed6 100755
--- a/API/UPLANET.sh
+++ b/API/UPLANET.sh
@@ -121,7 +121,7 @@ EMAIL="${PLAYER,,}" # lowercase
     echo "Umap : $REDIR"
 
 ## CHECK WHAT IS EMAIL
-if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
+if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
     echo "VALID ${EMAIL} EMAIL OK"
 
diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh
index 09f17c1a..913a23ab 100755
--- a/RUNTIME/G1PalPay.sh
+++ b/RUNTIME/G1PalPay.sh
@@ -120,7 +120,7 @@ while read LINE; do
     [[ $(cat ~/.zen/game/players/${PLAYER}/.atdate) -ge $IDATE ]]  && echo "PalPay $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue
 
     ## GET EMAILS FROM COMMENT
-    ICOMMENT=($(echo "$COMMENT" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+    ICOMMENT=($(echo "$COMMENT" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
 
     ## DIVIDE INCOMING AMOUNT TO SHARE
     echo "N=${#ICOMMENT[@]}"
@@ -217,7 +217,7 @@ while read LINE; do
     echo "$TTITLE"
 
     ## Count emails found
-    emails=($(echo "$TTAGS" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+    emails=($(echo "$TTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
     nb=${#emails[@]}
     zen=$(echo "scale=2; $nb / 10" | bc) ## / divide by 10
 
diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh
index 38c2caad..9fc92cf8 100755
--- a/tools/RSS2UPlanetTW.sh
+++ b/tools/RSS2UPlanetTW.sh
@@ -63,12 +63,12 @@ while read title; do
 
         ## CHECK FOR EMAIL SIGNATURES DIFFERENCE
         NTAGS=$(cat ~/.zen/tmp/${MOATS}/NEW.json | jq -r .tags)
-        NEMAILS=($(echo "$NTAGS" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+        NEMAILS=($(echo "$NTAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
         N=${#NEMAILS[@]}
         echo "New Tiddler signatures : ${NEMAILS[*]}"
 
         ITAGS=$(cat ~/.zen/tmp/${MOATS}/INSIDE.json | jq -r .tags)
-        IEMAILS=($(echo "$ITAGS" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
+        IEMAILS=($(echo "$ITAGS" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
         I=${#IEMAILS[@]}
         echo "Inside Tiddler signatures : ${IEMAILS[*]}"
 
diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh
index ce828125..1c0bb140 100755
--- a/tools/TW.cache.sh
+++ b/tools/TW.cache.sh
@@ -36,7 +36,7 @@ fi
             PLAYER=$(cat ~/.zen/tmp/${MOATS}MadeInZion.json | jq -r .[].player)
 
             ## EMAIL STYLE
-            if [[ "${PLAYER}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
+            if [[ "${PLAYER}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
                 echo "${ME} : VALID PLAYER (✜‿‿✜) $PLAYER "
 
                 tiddlywiki --load ~/.zen/tmp/${MOATS}/${MOATS}.astroindex.html  --output ~/.zen/tmp --render '.' ${MOATS}'Astroport.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'Astroport'
diff --git a/tools/search_for_this_email_in_players.sh b/tools/search_for_this_email_in_players.sh
index 5859b8e2..be45c522 100755
--- a/tools/search_for_this_email_in_players.sh
+++ b/tools/search_for_this_email_in_players.sh
@@ -17,7 +17,7 @@ ME="${0##*/}"
 
 EMAIL="$1"
 
-if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
+if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
 
     INDEX=$(ls $HOME/.zen/game/players/${EMAIL}/ipfs/moa/index.html 2>/dev/null) ## LOCAL
     [[ ! $INDEX ]] && INDEX=$(ls $HOME/.zen/tmp/${IPFSNODEID}/TW/${EMAIL}/index.html 2>/dev/null) ## CACHE