diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index d24ffb73..caf7969a 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -267,6 +267,7 @@ if grep -q "install_gnu_social" $COMPLETION_FILE; then
     if [ -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
         cd /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
         php scripts/registeruser.php -n $MY_USERNAME -w "$NEW_USER_PASSWORD" -e "$MY_USERNAME@$HOSTNAME"
+        freedombone-addemail -u $MY_USERNAME -e "noreply@$MICROBLOG_DOMAIN_NAME" -g gnusocial --public no
         echo $'Created GNU Social user'
     else
         echo $"Unable to find GNU Social installation at /var/www/$MICROBLOG_DOMAIN_NAME/htdocs"
@@ -366,9 +367,9 @@ if grep -q "install_irc_client" $COMPLETION_FILE; then
 fi
 
 if [ -f /etc/nginx/.htpasswd ]; then
-	if ! grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
-		echo "$NEW_USER_PASSWORD" | htpasswd -i -s /etc/nginx/.htpasswd $MY_USERNAME
-	fi
+    if ! grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
+        echo "$NEW_USER_PASSWORD" | htpasswd -i -s /etc/nginx/.htpasswd $MY_USERNAME
+    fi
 fi
 
 # add user menu on ssh login