diff --git a/admin_autoupdate.php b/admin_autoupdate.php
index 1632b1e3..e4593905 100644
--- a/admin_autoupdate.php
+++ b/admin_autoupdate.php
@@ -29,28 +29,30 @@ define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . \Froxlor\Froxl
 define('RELEASE_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip");
 define('CHECKSUM_URI', "https://autoupdate.froxlor.org/froxlor-{version}.zip.sha256");
 
-// check for archive-stuff
-if (!extension_loaded('zip')) {
-	\Froxlor\UI\Response::redirectTo($filename, array(
-		'page' => 'error',
-		'errno' => 2
-	));
-}
+if ($page != 'error') {
+	// check for archive-stuff
+	if (!extension_loaded('zip')) {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			'page' => 'error',
+			'errno' => 2
+		));
+	}
 
-// 0.11.x requires 7.4 at least
-if (version_compare("7.4.0", PHP_VERSION, ">=")) {
-	\Froxlor\UI\Response::redirectTo($filename, array(
-		'page' => 'error',
-		'errno' => 10
-	));
-}
+	// 0.11.x requires 7.4 at least
+	if (version_compare("7.4.0", PHP_VERSION, ">=")) {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			'page' => 'error',
+			'errno' => 10
+		));
+	}
 
-// check for webupdate to be enabled
-if (\Froxlor\Settings::Config('enable_webupdate') != true) {
-        \Froxlor\UI\Response::redirectTo($filename, array(
-                'page' => 'error',
-                'errno' => 11
-        ));
+	// check for webupdate to be enabled
+	if (\Froxlor\Settings::Config('enable_webupdate') != true) {
+		\Froxlor\UI\Response::redirectTo($filename, array(
+			'page' => 'error',
+			'errno' => 11
+		));
+	}
 }
 
 // display initial version check
diff --git a/lng/english.lng.php b/lng/english.lng.php
index cfaa8781..730c5055 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -898,7 +898,7 @@ $lng['serversettings']['session_allow_multiple_login']['description'] = 'If acti
 $lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Allow moving domains between admins';
 $lng['serversettings']['panel_allow_domain_change_admin']['description'] = 'If activated you can change the admin of a domain at domainsettings.<br /><b>Attention:</b> If a customer isn\'t assigned to the same admin as the domain, the admin can see every other domain of that customer!';
 $lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Allow moving domains between customers';
-$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'If activated you can change the customer of a domain at domainsettings.<br /><b>Attention:</b> Froxlor won\'t change any paths. This could render a domain unusable!';
+$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'If activated you can change the customer of a domain at domainsettings.<br /><b>Attention:</b> Froxlor changes the documentroot to the new customer\'s default homedir (+ domain-folder if activated)';
 $lng['domains']['associated_with_domain'] = 'Associated';
 $lng['domains']['aliasdomains'] = 'Alias domains';
 $lng['error']['ipportdoesntexist'] = 'The ip/port combination you have chosen doesn\'t exist.';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 8002cc72..563dbea3 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -892,7 +892,7 @@ $lng['serversettings']['session_allow_multiple_login']['description'] = 'Wenn di
 $lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Erlaube Verschieben von Domains unter Admins';
 $lng['serversettings']['panel_allow_domain_change_admin']['description'] = 'Wenn diese Option aktiviert ist, kann unter Domaineinstellungen die Domain einem anderen Admin zugewiesen werden.<br /><b>Achtung:</b> Wenn der Kunde einer Domain nicht dem gleichen Admin zugeordnet ist wie die Domain selbst, kann dieser Admin alle anderen Domains des Kunden sehen!';
 $lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Erlaube Verschieben von Domains unter Kunden';
-$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'Wenn diese Option aktiviert ist, kann unter Domaineinstellungen die Domain einem anderen Kunden zugewiesen werden.<br /><b>Achtung:</b> Es werden keine Pfade bei dieser Aktion angepasst. Das kann dazu führen, dass die Domain nach dem Verschieben nicht mehr richtig funktioniert!';
+$lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'Wenn diese Option aktiviert ist, kann unter Domaineinstellungen die Domain einem anderen Kunden zugewiesen werden.<br /><b>Achtung:</b> Der Dokumenten-Pfad der Domain wird auf den Heimatpfad (+ Domain-Ordner, sofern aktiviert) des neuen Kunden gesetzt.';
 $lng['domains']['associated_with_domain'] = 'Verbunden mit';
 $lng['domains']['aliasdomains'] = 'Aliasdomains';
 $lng['error']['ipportdoesntexist'] = 'Die gewählte IP/Port-Kombination existiert nicht.';