diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 017423f85fbee64a4a882e881818089e51156d38..c236f7c6277c091b191683f73c12f57e7c1414ee 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1028,6 +1028,7 @@ CREATE TABLE `web_domain` (
   `ssl_bundle` mediumtext NULL,
   `ssl_action` varchar(16) NULL,
   `stats_password` varchar(255) default NULL,
+  `allow_override` varchar(32) NOT NULL default 'All',
   `apache_directives` text,
   `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`domain_id`)
diff --git a/interface/web/admin/lib/lang/en.lng b/interface/web/admin/lib/lang/en.lng
index 4d0b01de95b443886f6e030fa84ac2f7fe31da20..3a12de9873ecf1fbb2de03c477e69c079dfd8a62 100644
--- a/interface/web/admin/lib/lang/en.lng
+++ b/interface/web/admin/lib/lang/en.lng
@@ -22,7 +22,7 @@ $wb['Add group'] = 'Add group';
 $wb['Edit group'] = 'Edit group';
 $wb['Groups'] = 'Groups';
 $wb['Edit server'] = 'Edit server';
-$wb['Edit Server IP'] = 'Edit Server IP';
+$wb['Edit Server IP'] = 'Server IP addresses';
 $wb['Servers'] = 'Servers';
 $wb['Sync. Now'] = 'Sync. Now';
 $wb['DB Sync.'] = 'DB Sync.';
@@ -33,5 +33,6 @@ $wb['Import'] = 'Import';
 $wb['Language Editor'] = 'Language Editor';
 $wb['Software'] = 'Software';
 $wb['Repositories'] = 'Repositories';
+$wb['Server Services'] = 'Server Services';
 
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 636ea72794789c6acfd55ad0ea8597965c79cdfb..472b90cfb17bdde6004f54f68792bce365f2d402 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -5,7 +5,7 @@ global $conf;
 $module['name'] 		= 'admin';
 $module['title'] 		= 'System';
 $module['template'] 	= 'module.tpl.htm';
-$module['startpage'] 	= 'admin/users_list.php';
+$module['startpage'] 	= 'admin/server_list.php';
 $module['tab_width']    = '60';
 
 
@@ -47,7 +47,7 @@ $items[] = array( 'title' 	=> 'Add server',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/server_edit.php');
 */
-$items[] = array( 'title' 	=> 'Edit server',
+$items[] = array( 'title' 	=> 'Server Services',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/server_list.php');
 
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index df2b75ae4531951975960558fa606ffcc8a8813f..eadc2d7bbbb9d4bb9d082b6ab1ae05e43d1d1e43 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -399,6 +399,17 @@ $form["tabs"]['advanced'] = array (
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
+		'allow_override' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
+														'errmsg'=> 'documentroot_error_empty'),
+									),
+			'default'	=> 'All',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
 		'apache_directives' => array (
 			'datatype'	=> 'TEXT',
 			'formtype'	=> 'TEXT',
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index 62e625abc68ee3d680bae8043d825f76a00d95bb..109d8e7af4fc13fa684eeb572bc558991ed3cd29 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -47,4 +47,5 @@ $wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
 $wb['error_ssl_country_empty'] = 'SSL Country is empty.';
 $wb["client_group_id_txt"] = 'Client';
 $wb["stats_password_txt"] = 'Webstatistics password';
+$wb["allow_override_txt"] = 'Allow Override';
 ?>
diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm
index 65809050554e9c908984757506b10495d9c0b8f4..3e70de941e95cbdef4a076002ee249ea0ebe9845 100644
--- a/interface/web/sites/templates/web_domain_advanced.htm
+++ b/interface/web/sites/templates/web_domain_advanced.htm
@@ -16,6 +16,10 @@
 		<label for="system_group">{tmpl_var name='system_group'}</label>
         <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
 			</div>
+	  <div class="ctrlHolder">
+      	<label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
+        <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
+			</div
       <div class="ctrlHolder">
       	<label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
       	<textarea name="apache_directives" id="apache_directives" rows='10' cols='30'>{tmpl_var name='apache_directives'}</textarea>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 950e8f0ed84012e9387c33525e20f773851355b3..ea7c9370ef9e614e0a53e3248353e85b5eaca35b 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -36,7 +36,7 @@
 	
     <Directory {tmpl_var name='web_document_root_www'}>
         Options FollowSymLinks
-        AllowOverride All
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -56,7 +56,7 @@
     </Directory>
     <Directory {tmpl_var name='web_document_root'}>
         Options FollowSymLinks
-        AllowOverride All
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -124,7 +124,7 @@
         AddHandler fcgid-script .php .php3 .php4 .php5
         FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
         Options +ExecCGI
-        AllowOverride all
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
     </Directory>
@@ -192,7 +192,7 @@
     
 	<Directory {tmpl_var name='web_document_root_www'}>
         Options FollowSymLinks
-        AllowOverride All
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -212,7 +212,7 @@
     </Directory>
     <Directory {tmpl_var name='web_document_root'}>
         Options FollowSymLinks
-        AllowOverride All
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
 <tmpl_if name='ssi' op='==' value='y'>
@@ -282,7 +282,7 @@
         AddHandler fcgid-script .php .php3 .php4 .php5
         FCGIWrapper <tmpl_var name='fastcgi_starter_path'><tmpl_var name='fastcgi_starter_script'> .php
         Options +ExecCGI
-        AllowOverride all
+        AllowOverride <tmpl_var name='allow_override'>
         Order allow,deny
         Allow from all
     </Directory>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7af0653b18219208477f8f24ae1c71bd431dea7b..5b6940390553250d6efab94a2b81610bdd40f145 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -554,6 +554,7 @@ class apache2_plugin {
 		$vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
 		$vhost_data["web_basedir"] = $web_config["website_basedir"];
 		$vhost_data["security_level"] = $web_config["security_level"];
+		$vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
 		
 		// Check if a SSL cert exists
 		$ssl_dir = $data["new"]["document_root"]."/ssl";