diff --git a/management/web_update.py b/management/web_update.py
index 41d8ca0c..754a6ce5 100644
--- a/management/web_update.py
+++ b/management/web_update.py
@@ -111,7 +111,7 @@ def do_web_update(env):
 			nginx_conf.append((domain, make_domain_config(domain, [template0, template3], ssl_certificates, env)))
 
 	# Load the currently enabled sites for nginx.
-	_, sites_enabled = shell('check_output', ["ls", "/etc/nginx/sites-enabled"])
+	sites_enabled = shell('check_output', ["ls", "/etc/nginx/sites-enabled"])
 	warnings = []
 	
 	# Did the files change? If not, don't bother writing & restarting nginx.
@@ -120,16 +120,15 @@ def do_web_update(env):
 		if "miab_%s" % domain not in sites_enabled:
 			warnings.append("Missing miab_%s in /etc/nginx/sites-enabled/\nCheck your configuration!" % domain)
 		nginx_conf_fn = "/etc/nginx/sites-available/miab_%s" % domain
-		if os.path.exists(nginx_conf_fn):
-			with open(nginx_conf_fn) as f:
-				if f.read() == conf:
-					continue
+		with open(nginx_conf_fn, "w+") as f:
+			if f.read() == conf:
+				continue
 
-			# Save the file.
-			with open(nginx_conf_fn, "w") as f:
-				f.write(conf)
-			
-			kick = True
+		# Save the file.
+		with open(nginx_conf_fn, "w") as f:
+			f.write(conf)
+		
+		kick = True
 	if kick:
 		# Kick nginx. Since this might be called from the web admin
 		# don't do a 'restart'. That would kill the connection before
diff --git a/tools/web_update b/tools/web_update
index 0ea7b281..09943b10 100755
--- a/tools/web_update
+++ b/tools/web_update
@@ -1,8 +1,12 @@
 #!/bin/bash
+rm -f /etc/nginx/conf.d/local.conf
 curl -s -d POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/web/update
 cd /etc/nginx/sites-available
 for f in miab_*
 do
- echo "Processing $f"
- ln -s "/etc/nginx/sites-available/$f" "/etc/nginx/sites-enabled/$f"
+ if ! [ -f "/etc/nginx/sites-enabled/$f" ]; then
+  echo "Processing $f"
+  ln -s "/etc/nginx/sites-available/$f" "/etc/nginx/sites-enabled/$f"
+ fi
 done
+curl -s -d POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/web/update