diff --git a/scripts/add_mail_user.sh b/scripts/add_mail_user.sh
index 1e7a58fd..c954e951 100644
--- a/scripts/add_mail_user.sh
+++ b/scripts/add_mail_user.sh
@@ -10,6 +10,6 @@ if [ -z "$EMAIL_PW" ]; then
         read -e -p "Email Password: " EMAIL_PW
 fi
 
-echo "INSERT INTO users (email, password) VALUES ('$EMAIL_ADDR', '`sudo doveadm pw -s SHA512-CRYPT -p $EMAIL_PW`');" \
+echo "INSERT INTO users (email, password) VALUES ('$EMAIL_ADDR', '`doveadm pw -s SHA512-CRYPT -p $EMAIL_PW`');" \
 	| sqlite3 $STORAGE_ROOT/mail/users.sqlite
 
diff --git a/scripts/start.sh b/scripts/start.sh
index 091a4ed0..2afd3725 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -17,6 +17,7 @@ if [ -z "$PUBLIC_HOSTNAME" ]; then
 	echo "We've guessed a value. Just backspace it if it's wrong."
 	echo "Josh uses box.occams.info as his hostname. Yours should"
 	echo "be similar."
+	echo
 	read -e -i "`hostname`" -p "Hostname: " PUBLIC_HOSTNAME
 fi
 
@@ -25,6 +26,7 @@ if [ -z "$PUBLIC_IP" ]; then
 	echo "Enter the public IP address of this machine, as given to"
 	echo "you by your ISP. We've guessed a value, but just backspace"
 	echo "it if it's wrong."
+	echo
 	read -e -i "`hostname -i`" -p "Public IP: " PUBLIC_IP
 fi
 
@@ -34,6 +36,10 @@ if [ -z "$STORAGE_ROOT" ]; then
 	mkdir -p $STORAGE_ROOT
 fi
 
+cat > /etc/mailinabox.conf << EOF;
+STORAGE_ROOT=$STORAGE_ROOT
+EOF
+
 . scripts/system.sh
 . scripts/dns.sh
 . scripts/mail.sh
diff --git a/scripts/system.sh b/scripts/system.sh
index 18ae4a80..10bd14ca 100755
--- a/scripts/system.sh
+++ b/scripts/system.sh
@@ -20,5 +20,3 @@ if [ -z "$DISABLE_FIREWALL" ]; then
 	ufw --force enable;
 fi
 
-
-