diff --git a/uber-datenblatt-template.txt b/uber-datenblatt-template.txt
index e2a8fe3..97e05ec 100644
--- a/uber-datenblatt-template.txt
+++ b/uber-datenblatt-template.txt
@@ -38,7 +38,6 @@ Pass:     SEDMYSQLPASS
 
 ## > WORDPRESS
 
-
 ## < WORDPRESS
 
 ## > EMAIL
@@ -47,22 +46,17 @@ Webmail: https://webmail.SEDDOMAIN
 
 # Receive
 Type:  IMAP
-Server: SEDDOMAIN
+Server: SEDHOSTNAME
 Port: 143
 STARTTLS / Password, normal
 
 # Send
 Type:  SMTP
-Server: SEDDOMAIN
+Server: SEDHOSTNAME
 Port: 587
 STARTTLS / Password, normal
 SMTP server requires authentication
 
-User:     
-Pass:     
-
-User:     
-Pass:     
 
 ## < EMAIL
 
diff --git a/uber-standardsetup.sh b/uber-standardsetup.sh
index 905c711..f3260c6 100755
--- a/uber-standardsetup.sh
+++ b/uber-standardsetup.sh
@@ -68,6 +68,11 @@ ln -s $VIRTUAL ~/virtual
 # Mail
 vsetup
 
+## PHP
+# Piwik and WP don't work smoothly with PHP 5.6, so switch to 5.5
+cp $HOME/etc/phpversion $HOME/etc/phpversion.original
+echo "PHPVERSION=5.5" > $HOME/etc/phpversion
+
 # Webmail
 mkdir $VIRTUAL/webmail.$DOMAIN
 echo "RedirectPermanent / https://webmail.$HOSTNAME" > $VIRTUAL/webmail.$DOMAIN/.htaccess