diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 862b22c3..aebf1ea0 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -41,7 +41,8 @@ else
     echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc
 fi
 
-sed -i "s|$USER@|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc
+USERN='$USER@'
+sed -i "s|$USERN|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc
 
 # generate a gpg key
 echo "Making a GPG key for $MY_USERNAME@$HOSTNAME"
@@ -138,7 +139,7 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
     if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then
         echo 'Blog users directory not found'
         userdel -r $MY_USERNAME
-        exit 8     
+        exit 8
     fi
     echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
     echo "password = '$NEW_USER_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini