diff --git a/conf/ios-profile.xml b/conf/ios-profile.xml
index 273c0bf6..de05c009 100644
--- a/conf/ios-profile.xml
+++ b/conf/ios-profile.xml
@@ -13,9 +13,9 @@
   <array>
     <dict>
       <key>CalDAVAccountDescription</key>
-      <string>PRIMARY_HOSTNAME calendar</string>
+      <string>DAV_HOSTNAME calendar</string>
       <key>CalDAVHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
+      <string>DAV_HOSTNAME</string>
       <key>CalDAVPort</key>
       <real>443</real>
       <key>CalDAVUseSSL</key>
@@ -23,9 +23,9 @@
       <key>PayloadDescription</key>
       <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
       <key>PayloadDisplayName</key>
-      <string>PRIMARY_HOSTNAME calendar</string>
+      <string>DAV_HOSTNAME calendar</string>
       <key>PayloadIdentifier</key>
-      <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.CalDAV</string>
+      <string>email.mailinabox.mobileconfig.DAV_HOSTNAME.CalDAV</string>
       <key>PayloadOrganization</key>
       <string></string>
       <key>PayloadType</key>
@@ -81,9 +81,9 @@
     </dict>
     <dict>
       <key>CardDAVAccountDescription</key>
-      <string>PRIMARY_HOSTNAME contacts</string>
+      <string>DAV_HOSTNAME contacts</string>
       <key>CardDAVHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
+      <string>DAV_HOSTNAME</string>
       <key>CardDAVPort</key>
       <integer>443</integer>
       <key>CardDAVPrincipalURL</key>
@@ -91,11 +91,11 @@
       <key>CardDAVUseSSL</key>
       <true/>
       <key>PayloadDescription</key>
-      <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
+      <string>DAV_HOSTNAME Server</string>
       <key>PayloadDisplayName</key>
-      <string>PRIMARY_HOSTNAME contacts</string>
+      <string>DAV_HOSTNAME contacts</string>
       <key>PayloadIdentifier</key>
-      <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.carddav</string>
+      <string>email.mailinabox.mobileconfig.DAV_HOSTNAME.carddav</string>
       <key>PayloadOrganization</key>
       <string></string>
       <key>PayloadType</key>
diff --git a/setup/web.sh b/setup/web.sh
index 21b0152e..68653a63 100755
--- a/setup/web.sh
+++ b/setup/web.sh
@@ -120,6 +120,8 @@ chmod a+r /var/lib/mailinabox/mobileconfig.xml
 cat conf/mozilla-autoconfig.xml \
 	| sed "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" \
 	 > /var/lib/mailinabox/mozilla-autoconfig.xml
+    sed "s/DAV_HOSTNAME/$DAV_HOSTNAME/" /var/lib/mailinabox/mozilla-autoconfig.xml
+
 chmod a+r /var/lib/mailinabox/mozilla-autoconfig.xml
 
 # Create a generic mta-sts.txt file which is exposed via the
@@ -157,7 +159,4 @@ ufw_allow https
 if [ $DAV_HOSTNAME != $PRIMARY_HOSTNAME ]; then
     cp management/templates/sync-guide.html management/templates/sync-guide-int.html
     cp management/templates/sync-guide-ext.html management/templates/sync-guide.html
-    sed -i "s/DAV_HOSTNAME/$DAV_HOSTNAME/" management/templates/sync-guide.html
-    #sed -i "s/CALDAV_URL/$CALDAV_URL/" management/tempmlates/sync-guide.html
-    #sec -i "s/CARDDAV_URL/$CARDDAV_URL/" management/templates/sync-guide.html
 fi