diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index ee3f0116..6ca725b8 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -112,6 +112,38 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
+				'defaultwebsrverrhandler_enabled' => array(
+					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'defaultwebsrverrhandler_err401' => array(
+					'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'err401',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'defaultwebsrverrhandler_err403' => array(
+					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'err403',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
+				'defaultwebsrverrhandler_err404' => array(
+					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
+					'settinggroup' => 'defaultwebsrverrhandler',
+					'varname' => 'err404',
+					'type' => 'text',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
 				),
 			),
 		'ssl' => array(
diff --git a/install/froxlor.sql b/install/froxlor.sql
index b72c7ab5..7c580d31 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6-svn2');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6-svn3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 78a342a8..4eb0bb24 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -516,4 +516,52 @@ if(isFroxlorVersion('0.9.6-svn1'))
 	}
 }
 
+if(isFroxlorVersion('0.9.6-svn2'))
+{
+	showUpdateStep("Updating from 0.9.6-svn2 to 0.9.6-svn3", false);
+	
+	$update_deferr_enable = isset($_POST['update_deferr_enable']) ? true : false;
+
+	showUpdateStep("Adding new webserver configurations to database");
+	if($update_deferr_enable == true)
+	{
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '1');");
+		
+		if(isset($_POST['update_deferr_500'])
+			&& trim($_POST['update_deferr_500']) != ''
+		) {
+			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');");
+		}
+		
+		if(isset($_POST['update_deferr_401'])
+			&& trim($_POST['update_deferr_401']) != ''
+		) {
+			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_401'])."');");
+		}
+		
+		if(isset($_POST['update_deferr_403'])
+			&& trim($_POST['update_deferr_403']) != ''
+		) {
+			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_403'])."');");
+		}
+		
+		if(isset($_POST['update_deferr_404'])
+			&& trim($_POST['update_deferr_404']) != ''
+		) {
+			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_404'])."');");
+		}
+	} 
+	else
+	{
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '0');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '');");	
+	}
+	lastStepStatus(0);
+
+	updateToVersion('0.9.6-svn3');
+}
+
 ?>
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 350485a3..28a9b93e 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -44,7 +44,22 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		{
 			$has_preconfig = true;
 			$return .= 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
-			$return .= '<br /><br /><strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" name="update_adminmail" value="'.$settings['panel']['adminmail'].'" />';
+			$return .= '<br /><br /><strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" name="update_adminmail" value="'.$settings['panel']['adminmail'].'" /><br /><br />';
 		}
 	}
+
+	if(versionInUpdate($current_version, '0.9.6-svn3'))
+	{
+		$has_preconfig = true;
+		$return .= 'You now have the possibility to define default error-documents for your webserver which replace the default webserver output.<br />';
+		$return .= '<strong>Do you want to enable default error-documents?:</strong>&nbsp;';
+		$return .= makeyesno('update_deferr_enable', '1', '0', '9').'<br /><br />';
+		if($settings['system']['webserver'] == 'apache2')
+		{
+			$return .= '<strong>Path/URL for error 500:</strong>&nbsp;<input type="text" name="update_deferr_500" /><br />';
+			$return .= '<strong>Path/URL for error 401:</strong>&nbsp;<input type="text" name="update_deferr_401" /><br />';
+			$return .= '<strong>Path/URL for error 403:</strong>&nbsp;<input type="text" name="update_deferr_403" /><br />';
+		}
+		$return .= '<strong>Path/URL for error 404:</strong>&nbsp;<input type="text" name="update_deferr_404" /><br /><br />';
+	}
 }
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 2cb67440..bb253bb1 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -68,7 +68,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.6-svn2';
+$version = '0.9.6-svn3';
 $dbversion = '2';
 $branding = '';
 
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 6411a57a..25580b31 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1367,4 +1367,14 @@ $lng['serversettings']['defaultttl'] = 'Domain TTL for bind in seconds (default
 $lng['ticket']['logicalorder'] = 'Logical order';
 $lng['ticket']['orderdesc'] = 'Here you can define your own logical order for the ticket-category. Use 1 - 999, lower numbers are displayed first.';
 
+// ADDED IN FROXLOR 0.9.6-svn3
+$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Enable default errordocuments for all customers';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL for error 401';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL for error 403';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL for error 404';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL for error 500';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+
 ?>
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 2fc8814f..c3e976ca 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1363,4 +1363,14 @@ $lng['serversettings']['defaultttl'] = 'Domain TTL f&uuml;r Bind in Sekunden (de
 $lng['ticket']['logicalorder'] = 'Logische Sortierung';
 $lng['ticket']['orderdesc'] = 'Hier kann eine logische Sortierung f&uuml;r die Ticket-Kategorien angegeben werden. Benutze 1 - 999, niedrigere Zahlen werden zuerst angezeigt.';
 
+// ADDED IN FROXLOR 0.9.6-svn3
+$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Verwende Standard-Fehlerdokumente f&uuml;r alle Kunden';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Datei/URL f&uuml;r Fehler 401';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Datei/URL f&uuml;r Fehler 403';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Datei/URL f&uuml;r Fehler 404';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Datei/URL f&uuml;r Fehler 500';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+
 ?>