diff --git a/conf/nginx.conf b/conf/nginx.conf
index eb05b634..ff184ca2 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -46,9 +46,6 @@ server {
 	}
 
 	# ownCloud configuration.
-	rewrite ^/caldav(.*)$ /cloud/remote.php/caldav$1 redirect;
-	rewrite ^/carddav(.*)$ /cloud/remote.php/carddav$1 redirect;
-	rewrite ^/webdav(.*)$ /cloud/remote.php/webdav$1 redirect;
 	rewrite ^/cloud$ /cloud/ redirect;
 	rewrite ^/cloud/$ /cloud/index.php;
 	rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
@@ -71,6 +68,11 @@ server {
 		client_max_body_size 1G;
 		fastcgi_buffers 64 4K;
 	}
+	location ~ ^/((caldav|carddav|webdav).*)$ {
+		# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
+		# Properly proxying like this seems to work fine.
+		proxy_pass https://$HOSTNAME/cloud/remote.php/$1;
+	}
 	rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
 	rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
 	rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;
diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 5429de49..4e164d91 100755
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -93,16 +93,16 @@ fi
 curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/lib/owncloud/apps/mail
 php /usr/local/lib/owncloud/apps/mail/composer.phar install --working-dir=/usr/local/lib/owncloud/apps/mail
 chmod -R 777 /usr/local/lib/owncloud/apps/mail/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
+chown -R www-data.www-data /usr/local/lib/owncloud/apps/mail/
 
 # Use Crontab instead of AJAX/webcron in ownCloud
 # TODO: somehow change the cron option in ownClouds config, not exposed afaik?
 (crontab -u www-data -l; echo "*/15  *  *  *  * php -f /usr/local/lib/owncloud/cron.php" ) | crontab -u www-data -
 
-# Enable apps.
-hide_output php /usr/local/lib/owncloud/console.php app:enable user_external
-hide_output php /usr/local/lib/owncloud/console.php app:enable mail
+# This seems to need to be disabled or things just don't work right. Josh gets an empty modal box and can't use the site.
+hide_output php /usr/local/lib/owncloud/console.php app:disable firstrunwizard
 
-# Enable apps.
+# Enable apps. These don't seem to work until after the administrator account is created, which we haven't done here.
 hide_output php /usr/local/lib/owncloud/console.php app:enable user_external
 hide_output php /usr/local/lib/owncloud/console.php app:enable mail