diff --git a/README.md b/README.md
index 8b17c701..cd7cf726 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ This setup is what has been powering my own personal email since September 2013.
 Please see the initial and very barebones [Documentation](docs/index.md) for more information on how to set up a Mail-in-a-Box. But in short, it's like this:
 
 	sudo apt-get install -y git
-	git clone https://github.com/tauberer/mailinabox
+	git clone https://github.com/joshdata/mailinabox
 	cd mailinabox
 	sudo scripts/start.sh
 
diff --git a/docs/index.md b/docs/index.md
index d36ebe0a..84bd5991 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -32,7 +32,7 @@ Configuring the Server
 After logging into your server with SSH and becoming root, type the following in the console:
 
 	sudo apt-get install -y git
-	git clone https://github.com/tauberer/mailinabox
+	git clone https://github.com/joshdata/mailinabox
 	cd mailinabox
 	
 Now you've got the Mail-in-a-Box source code stored on your server. The next command starts the automatic configuration of the server:
diff --git a/scripts/mail.sh b/scripts/mail.sh
index 90f0edf5..9a5d0e20 100755
--- a/scripts/mail.sh
+++ b/scripts/mail.sh
@@ -14,7 +14,7 @@
 
 source /etc/mailinabox.conf # load global vars
 
-DEBIAN_FRONTEND=noninteractive apt-get install -q -y \
+DEBIAN_FRONTEND=noninteractive apt-get -q -y install \
 	postfix postgrey \
 	dovecot-core dovecot-imapd dovecot-lmtpd dovecot-sqlite sqlite3 \
 	openssl
diff --git a/scripts/start.sh b/scripts/start.sh
index 6536ec00..8ff41efe 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -46,7 +46,7 @@ if [ -z "$PUBLIC_IP" ]; then
 	read -e -i "`hostname -i`" -p "Public IP: " PUBLIC_IP
 fi
 
-# Create the user named "userconfig-data" and store all persistent user
+# Create the user named "user-data" and store all persistent user
 # data (mailboxes, etc.) in that user's home directory.
 if [ -z "$STORAGE_ROOT" ]; then
 	STORAGE_USER=user-data
diff --git a/scripts/system.sh b/scripts/system.sh
index b395332e..5394889e 100755
--- a/scripts/system.sh
+++ b/scripts/system.sh
@@ -13,7 +13,7 @@ apt-get -q -y install python3
 #
 # These services don't need further configuration and are started immediately after installation.
 
-apt-get install -q -y ntp fail2ban
+apt-get -q -y install ntp fail2ban
 
 # Turn on the firewall. First allow incoming SSH, then turn on the firewall.
 # Other ports will be opened at the point where we set up those services.