diff --git a/uber-standardsetup.sh b/uber-standardsetup.sh
index b6a384d..d4ba29c 100755
--- a/uber-standardsetup.sh
+++ b/uber-standardsetup.sh
@@ -81,8 +81,8 @@ echo "RedirectPermanent / https://webmail.$HOSTNAME" > $VIRTUAL/webmail.$DOMAIN/
 read -p "Should the web administration panel be installed? [y/N] " YN
 if [ "$YN" == "y" ]; then
   SENDMAILPATH=$(which sendmail)
-  read -p "TO which email should reports be sent?" TOEMAIL
-  read -p "FROM which email should reports be sent?" FREMAIL
+  read -p "TO which email should reports be sent? " TOEMAIL
+  read -p "FROM which email should reports be sent? " FREMAIL
   
   git clone http://src.mehl.mx/git/uberspace-webadmin.git $VIRTUAL/panel.$DOMAIN
   
@@ -90,9 +90,8 @@ if [ "$YN" == "y" ]; then
   cp $VIRTUAL/panel.$DOMAIN/config.cfg.sample $VIRTUAL/panel.$DOMAIN/config.cfg
   sed -r -i \
   -e "s|DOMAIN=.*|DOMAIN=$DOMAIN|" \
-  -e "s|TOEMAIL=.*|DOMAIN=$DOMAIN|" \
-  -e "s|FREMAIL=.*|DOMAIN=$DOMAIN|" \
-  -e "s|SENDMAILPATH=.*|DOMAIN=$DOMAIN|" \
+  -e "s|TOEMAIL=.*|TOEMAIL=$TOEMAIL|" \
+  -e "s|FREMAIL=.*|FREMAIL=$FREMAIL|" \
   $VIRTUAL/panel.$DOMAIN/config.cfg
   
   # Set htaccess and htpasswd