diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 4300660693c480c2bff112d661e179fddfcab225..eac3684ee8a792403b7102659196cc6a01786ab8 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -1,268 +1,270 @@
 
 <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
-    AllowOverride None
-    Order Deny,Allow
-    Deny from all
+		AllowOverride None
+		Order Deny,Allow
+		Deny from all
 </Directory>
 
 <tmpl_loop name="vhosts">
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
 <tmpl_if name='php' op='==' value='suphp'>
-    DocumentRoot <tmpl_var name='web_document_root'>
+		DocumentRoot <tmpl_var name='web_document_root'>
 </tmpl_else>
-  <tmpl_if name='php' op='==' value='cgi'>
-    DocumentRoot <tmpl_var name='web_document_root'>
-  </tmpl_else>
-    DocumentRoot <tmpl_var name='web_document_root_www'>
-  </tmpl_if>
+	<tmpl_if name='php' op='==' value='cgi'>
+		DocumentRoot <tmpl_var name='web_document_root'>
+	</tmpl_else>
+		DocumentRoot <tmpl_var name='web_document_root_www'>
+	</tmpl_if>
 </tmpl_if>
 
-    ServerName <tmpl_var name='domain'>
+		ServerName <tmpl_var name='domain'>
 <tmpl_if name='alias'>
-    <tmpl_var name='alias'>
+		<tmpl_var name='alias'>
 </tmpl_if>
-    ServerAdmin webmaster@<tmpl_var name='domain'>
+		ServerAdmin webmaster@<tmpl_var name='domain'>
 
-    ErrorLog /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log
+		ErrorLog /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log
 
 <tmpl_if name='errordocs'>
-    Alias /error/ "<tmpl_var name='web_document_root_www'>/error/"
-    ErrorDocument 400 /error/400.html
-    ErrorDocument 401 /error/401.html
-    ErrorDocument 403 /error/403.html
-    ErrorDocument 404 /error/404.html
-    ErrorDocument 405 /error/405.html
-    ErrorDocument 500 /error/500.html
-    ErrorDocument 502 /error/502.html
-    ErrorDocument 503 /error/503.html
+		Alias /error/ "<tmpl_var name='web_document_root_www'>/error/"
+		ErrorDocument 400 /error/400.html
+		ErrorDocument 401 /error/401.html
+		ErrorDocument 403 /error/403.html
+		ErrorDocument 404 /error/404.html
+		ErrorDocument 405 /error/405.html
+		ErrorDocument 500 /error/500.html
+		ErrorDocument 502 /error/502.html
+		ErrorDocument 503 /error/503.html
 </tmpl_if>
 
-    <IfModule mod_ssl.c>
+		<IfModule mod_ssl.c>
 <tmpl_if name='ssl_enabled'>
 	SSLEngine on
-    SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
-    SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
+		SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
+		SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
 <tmpl_if name='has_bundle_cert'>
-    SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
+		SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
 </tmpl_if>
 </tmpl_if>
-    </IfModule>
+		</IfModule>
 
-    <Directory {tmpl_var name='web_document_root_www'}>
-        Options FollowSymLinks
-        AllowOverride <tmpl_var name='allow_override'>
-        Order allow,deny
-        Allow from all
+		<Directory {tmpl_var name='web_document_root_www'}>
+				Options FollowSymLinks
+				AllowOverride <tmpl_var name='allow_override'>
+				Order allow,deny
+				Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
-        
-        # ssi enabled
-        AddType text/html .shtml
-        AddOutputFilter INCLUDES .shtml
-        Options +Includes
+
+				# ssi enabled
+				AddType text/html .shtml
+				AddOutputFilter INCLUDES .shtml
+				Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php[s3-6]{0,1}$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
+				<Files ~ '.php[s3-6]{0,1}$'>
+						Order allow,deny
+						Deny from all
+						Allow from none
+				</Files>
 </tmpl_if>
-    </Directory>
-    <Directory {tmpl_var name='web_document_root'}>
-        Options FollowSymLinks
-        AllowOverride <tmpl_var name='allow_override'>
-        Order allow,deny
-        Allow from all
+		</Directory>
+		<Directory {tmpl_var name='web_document_root'}>
+				Options FollowSymLinks
+				AllowOverride <tmpl_var name='allow_override'>
+				Order allow,deny
+				Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
-        
-        # ssi enabled
-        AddType text/html .shtml
-        AddOutputFilter INCLUDES .shtml
-        Options +Includes
+
+				# ssi enabled
+				AddType text/html .shtml
+				AddOutputFilter INCLUDES .shtml
+				Options +Includes
 </tmpl_if>
 <tmpl_if name='php' op='==' value='no'>
-        <Files ~ '.php[s3-6]{0,1}$'>
-            Order allow,deny
-            Deny from all
-            Allow from none
-        </Files>
+				<Files ~ '.php[s3-6]{0,1}$'>
+						Order allow,deny
+						Deny from all
+						Allow from none
+				</Files>
 </tmpl_if>
-    </Directory>
+		</Directory>
 
 <tmpl_if name='ruby' op='==' value='y'>
-    <IfModule mod_ruby.c>
-      <Directory {tmpl_var name='web_document_root_www'}>
-        Options +ExecCGI
-      </Directory>
-      RubyRequire apache/ruby-run
-      #RubySafeLevel 0
-      <Files *.rb>
-        SetHandler ruby-object
-        RubyHandler Apache::RubyRun.instance
-      </Files>
-      <Files *.rbx>
-        SetHandler ruby-object
-        RubyHandler Apache::RubyRun.instance
-      </Files>
-    </IfModule>
+		<IfModule mod_ruby.c>
+			<Directory {tmpl_var name='web_document_root_www'}>
+				Options +ExecCGI
+			</Directory>
+			RubyRequire apache/ruby-run
+			#RubySafeLevel 0
+			AddType text/html .rb
+			AddType text/html .rbx
+			<Files *.rb>
+				SetHandler ruby-object
+				RubyHandler Apache::RubyRun.instance
+			</Files>
+			<Files *.rbx>
+				SetHandler ruby-object
+				RubyHandler Apache::RubyRun.instance
+			</Files>
+		</IfModule>
 </tmpl_if>
 
 <tmpl_if name='python' op='==' value='y'>
-    <IfModule mod_python.c>
-      <Directory {tmpl_var name='web_document_root_www'}>
-        AddHandler mod_python .py
-        PythonHandler mod_python.publisher
-        PythonDebug On
-      </Directory>
-    </IfModule>
+		<IfModule mod_python.c>
+			<Directory {tmpl_var name='web_document_root_www'}>
+				AddHandler mod_python .py
+				PythonHandler mod_python.publisher
+				PythonDebug On
+			</Directory>
+		</IfModule>
 </tmpl_if>
 
 <tmpl_if name='cgi' op='==' value='y'>
-    # cgi enabled
+		# cgi enabled
 	<Directory {tmpl_var name='document_root'}/cgi-bin>
-      Order allow,deny
-      Allow from all
-    </Directory>
-    ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
-    AddHandler cgi-script .cgi
-    AddHandler cgi-script .pl
+			Order allow,deny
+			Allow from all
+		</Directory>
+		ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
+		AddHandler cgi-script .cgi
+		AddHandler cgi-script .pl
 </tmpl_if>
 <tmpl_if name='suexec' op='==' value='y'>
-    # suexec enabled
-    <IfModule mod_suexec.c>
-      SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
-    </IfModule>
+		# suexec enabled
+		<IfModule mod_suexec.c>
+			SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+		</IfModule>
 </tmpl_if>
-    # Clear PHP settings of this website
-    <FilesMatch "\.ph(p3?|tml)$">
-        SetHandler None
-    </FilesMatch>
+		# Clear PHP settings of this website
+		<FilesMatch "\.ph(p3?|tml)$">
+				SetHandler None
+		</FilesMatch>
 <tmpl_if name='php' op='==' value='mod'>
-    # mod_php enabled
-    AddType application/x-httpd-php .php .php3 .php4 .php5
-    php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"	
-    php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
-    php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
+		# mod_php enabled
+		AddType application/x-httpd-php .php .php3 .php4 .php5
+		php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
+		php_admin_value upload_tmp_dir <tmpl_var name='document_root'>/tmp
+		php_admin_value session.save_path <tmpl_var name='document_root'>/tmp
 	# PHPIniDir <tmpl_var name='custom_php_ini_dir'>
 <tmpl_if name='security_level' op='==' value='20'>
-    php_admin_value open_basedir <tmpl_var name='php_open_basedir'>
+		php_admin_value open_basedir <tmpl_var name='php_open_basedir'>
 </tmpl_if>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='suphp'>
-    # suphp enabled
-    <Directory {tmpl_var name='web_document_root'}>
+		# suphp enabled
+		<Directory {tmpl_var name='web_document_root'}>
 		<IfModule mod_suphp.c>
-        suPHP_Engine on
-        # suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+				suPHP_Engine on
+				# suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
 <tmpl_if name='has_custom_php_ini'>
 	suPHP_ConfigPath <tmpl_var name='custom_php_ini_dir'>
 </tmpl_if>
-        AddHandler x-httpd-suphp .php .php3 .php4 .php5
-        suPHP_AddHandler x-httpd-suphp
+				AddHandler x-httpd-suphp .php .php3 .php4 .php5
+				suPHP_AddHandler x-httpd-suphp
 		</IfModule>
-    </Directory>
+		</Directory>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='cgi'>
-    # php as cgi enabled
-    ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
-    Action php5-cgi /php5-cgi
-    AddHandler php5-cgi .php .php3 .php4 .php5
-    <Directory {tmpl_var name='cgi_starter_path'}>
-        Order allow,deny
-        Allow from all
-    </Directory>
+		# php as cgi enabled
+		ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
+		Action php5-cgi /php5-cgi
+		AddHandler php5-cgi .php .php3 .php4 .php5
+		<Directory {tmpl_var name='cgi_starter_path'}>
+				Order allow,deny
+				Allow from all
+		</Directory>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='fast-cgi'>
-    # php as fast-cgi enabled
+		# php as fast-cgi enabled
 	# For config options see: http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
-    <IfModule mod_fcgid.c>
+		<IfModule mod_fcgid.c>
 <tmpl_if name='fastcgi_config_syntax' op='==' value='2'>
-        FcgidIdleTimeout 300
-        FcgidProcessLifeTime 3600
-        # FcgidMaxProcesses 1000
-        FcgidMinProcessesPerClass 0
-        FcgidMaxProcessesPerClass 100
-        FcgidConnectTimeout 3
-        FcgidIOTimeout 360
-        FcgidBusyTimeout 300
+				FcgidIdleTimeout 300
+				FcgidProcessLifeTime 3600
+				# FcgidMaxProcesses 1000
+				FcgidMinProcessesPerClass 0
+				FcgidMaxProcessesPerClass 100
+				FcgidConnectTimeout 3
+				FcgidIOTimeout 360
+				FcgidBusyTimeout 300
 		FcgidMaxRequestLen 1073741824
 <tmpl_else>
-        IdleTimeout 300
-        ProcessLifeTime 3600
-        # MaxProcessCount 1000
-        DefaultMinClassProcessCount 0
-        DefaultMaxClassProcessCount 100
-        IPCConnectTimeout 3
-        IPCCommTimeout 360
-        BusyTimeout 300
+				IdleTimeout 300
+				ProcessLifeTime 3600
+				# MaxProcessCount 1000
+				DefaultMinClassProcessCount 0
+				DefaultMaxClassProcessCount 100
+				IPCConnectTimeout 3
+				IPCCommTimeout 360
+				BusyTimeout 300
 </tmpl_if>
-    </IfModule>
-    <Directory {tmpl_var name='web_document_root_www'}>
-        AddHandler fcgid-script .php .php3 .php4 .php5
-        FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
-        Options +ExecCGI
-        AllowOverride <tmpl_var name='allow_override'>
-        Order allow,deny
-        Allow from all
-    </Directory>
-    <Directory {tmpl_var name='web_document_root'}>
-        AddHandler fcgid-script .php .php3 .php4 .php5
-        FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
-        Options +ExecCGI
-        AllowOverride <tmpl_var name='allow_override'>
-        Order allow,deny
-        Allow from all
-    </Directory>
+		</IfModule>
+		<Directory {tmpl_var name='web_document_root_www'}>
+				AddHandler fcgid-script .php .php3 .php4 .php5
+				FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
+				Options +ExecCGI
+				AllowOverride <tmpl_var name='allow_override'>
+				Order allow,deny
+				Allow from all
+		</Directory>
+		<Directory {tmpl_var name='web_document_root'}>
+				AddHandler fcgid-script .php .php3 .php4 .php5
+				FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
+				Options +ExecCGI
+				AllowOverride <tmpl_var name='allow_override'>
+				Order allow,deny
+				Allow from all
+		</Directory>
 </tmpl_if>
 <tmpl_if name='php' op='==' value='php-fpm'>
-    <IfModule mod_fastcgi.c>
-        <Directory /usr/lib/cgi-bin>
-            Order allow,deny
-            Allow from all
-        </Directory>
-        AddHandler php5-fcgi .php
-        Action php5-fcgi /php5-fcgi
-        Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+		<IfModule mod_fastcgi.c>
+				<Directory /usr/lib/cgi-bin>
+						Order allow,deny
+						Allow from all
+				</Directory>
+				AddHandler php5-fcgi .php
+				Action php5-fcgi /php5-fcgi
+				Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
 <tmpl_if name='use_tcp'>
-        FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
+				FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
 </tmpl_if>
 <tmpl_if name='use_socket'>
-        FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
+				FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
 </tmpl_if>
-    </IfModule>
+		</IfModule>
 </tmpl_if>
 
 <tmpl_if name="rewrite_enabled">
-    RewriteEngine on
+		RewriteEngine on
 <tmpl_if name='seo_redirect_enabled'>
-    RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
-    RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
+		RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
+		RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
 </tmpl_if>
 <tmpl_loop name="redirects">
-    RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
+		RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
 	RewriteCond %{REQUEST_URI} !^/webdav/
-    RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  <tmpl_var name='rewrite_type'>
+		RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  <tmpl_var name='rewrite_type'>
 </tmpl_loop>
 </tmpl_if>
 
-    # add support for apache mpm_itk
-    <IfModule mpm_itk_module>
-      AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
-    </IfModule>
+		# add support for apache mpm_itk
+		<IfModule mpm_itk_module>
+			AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
+		</IfModule>
 
-    <IfModule mod_dav_fs.c>
-	  # Do not execute PHP files in webdav directory
-      <Directory {tmpl_var name='document_root'}/webdav>
-	    <FilesMatch "\.ph(p3?|tml)$">
-          SetHandler None
-        </FilesMatch>
-      </Directory>
-      DavLockDB {tmpl_var name='document_root'}/tmp/DavLock
-      # DO NOT REMOVE THE COMMENTS!
-      # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
-      # WEBDAV BEGIN
-      # WEBDAV END
-    </IfModule>
+		<IfModule mod_dav_fs.c>
+		# Do not execute PHP files in webdav directory
+			<Directory {tmpl_var name='document_root'}/webdav>
+			<FilesMatch "\.ph(p3?|tml)$">
+					SetHandler None
+				</FilesMatch>
+			</Directory>
+			DavLockDB {tmpl_var name='document_root'}/tmp/DavLock
+			# DO NOT REMOVE THE COMMENTS!
+			# IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
+			# WEBDAV BEGIN
+			# WEBDAV END
+		</IfModule>
 
 <tmpl_var name='apache_directives'>
 </VirtualHost>