diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index edab62fa36131de8f996200939d19d85a1e036be..03ccb1e4f2219a6f28c1c2980f111a222fba018c 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -1039,7 +1039,7 @@ class tform_base {
 				break;
 			case 'V6PREFIXLENGTH':
 				// find shortes ipv6 subnet can`t be longer
-				$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1;");
+				$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1");
 				$sql_v6_explode=explode(':',$sql_v6['ip_address']);
 				$explode_field_value = explode(':',$field_value);
 				if (count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address'])) {
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 6d3342ca4b34b3d1441c4c5621d57990a1f5a11e..c9fc989da5a83b397ac69092c6b4797222105411 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -173,6 +173,7 @@ $wb['awstats_settings_txt'] = 'AWStats Einstellungen';
 $wb['backup_mode_txt'] = 'Backupmodus';
 $wb['backup_mode_userzip'] = 'Backup Dateien gehören dem Web Benutzer (.zip Datei)';
 $wb['backup_mode_rootgz'] = 'Backup aller Dateien des Webverzeichnisses als Root Benutzer';
+$wb['backup_time_txt'] = 'Backupzeit';
 $wb['firewall_txt'] = 'Firewall';
 $wb['mailbox_quota_stats_txt'] = 'E-Mailkonto Beschränkung Statistiken';
 $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 19b08f11e2b58c2aba0db73f7e4a582c55c67361..c464ff96cc87afda44fc975d5f851d5e0f1d18b4 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -101,6 +101,7 @@ $wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
 $wb["backup_mode_txt"] = 'Backup mode';
 $wb["backup_mode_userzip"] = 'Backup web files owned by web user as zip';
 $wb["backup_mode_rootgz"] = 'Backup all files in web directory as root user';
+$wb["backup_time_txt"] = 'Backup time';
 $wb["server_type_txt"] = 'Server Type';
 $wb["nginx_vhost_conf_dir_txt"] = 'Nginx Vhost config dir';
 $wb["nginx_vhost_conf_enabled_dir_txt"] = 'Nginx Vhost config enabled dir';
diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm
index c651e4246776a38c76c8b230113ce7db4b2b30e0..95cc33bb1d42ca97d4b7cc19df8d2751fa9eb1c8 100644
--- a/interface/web/admin/templates/system_config_domains_edit.htm
+++ b/interface/web/admin/templates/system_config_domains_edit.htm
@@ -6,13 +6,13 @@
 <tmpl_if name="list_desc_txt"><p><tmpl_var name="list_desc_txt"></p></tmpl_if>
 
             <div class="form-group">
-                <div style="float:left;width:100%">
-                    <p class="label" style="width:270px">{tmpl_var name='use_domain_module_txt'}</p>
-                    <div class="col-sm-9">
-                        {tmpl_var name='use_domain_module'}
-                    </div>
+                <div class="col-sm-3 text-right">
+                    {tmpl_var name='use_domain_module'}
+                </div>
+                <div class="col-sm-9">
+                    <p><strong>{tmpl_var name='use_domain_module_txt'}</strong></p>
+                    <p>{tmpl_var name='use_domain_module_hint'}</p>
                 </div>
-                <div style="float:left;width:500px;margin-top:20px">{tmpl_var name='use_domain_module_hint'}</div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm
index 825b2987117ff9f4367a8215b9a304933ca98d9b..8dda689cba7e0b728eb475da8c4d75ca32afc109 100644
--- a/interface/web/client/templates/domain_list.htm
+++ b/interface/web/client/templates/domain_list.htm
@@ -45,10 +45,10 @@
 
             <tfoot>
                 <tr>
-                    <td colspan="4"><tmpl_var name="paging"></td>
+                    <td colspan="3"><tmpl_var name="paging"></td>
                 </tr>
             </tfoot>
             </table>
 </div>
         
-    
\ No newline at end of file
+    
diff --git a/interface/web/dashboard/dashlets/templates/modules.htm b/interface/web/dashboard/dashlets/templates/modules.htm
index d42bf2e01689805722cc25c3ceee6d41ccea04f5..0c7322b954b37ccf6a5e158b25e2d4d1cf8d8708 100644
--- a/interface/web/dashboard/dashlets/templates/modules.htm
+++ b/interface/web/dashboard/dashlets/templates/modules.htm
@@ -9,8 +9,8 @@
 				<div class='title'>{tmpl_var name='modules_title'}</div>
 			  </div>
 			</div>
-			<a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
+			<a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>{tmpl_var name='go_to_txt'} {tmpl_var name='modules_title'}</a>
 		</li>
 	</tmpl_loop>
 	</ul>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng b/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
index 2b0f0e24cf6615c4e76410ba1f71fc4caaa57af8..6e6cd619c71e47e3214f68cf064ab87a2a61814a 100644
--- a/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Налични Модули';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_modules.lng b/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
index 11268f764e06a721bf8138447fb64139c068bcc7..fab05063175815870b723c335e3ef78712d12c57 100644
--- a/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Módulos Disponíveis';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
index 4d6a5d827af8b51ed8e2ff53c88ad034029a0325..f8f08181b123c40cab3d65d77c414857fb5b355a 100644
--- a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index 66275f1d0573489acd4a185f62b4fbfbecf3f2fd..25198e183fee5fe9b5f85d6866987d55d1926ef2 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupné moduly';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
index 3d2c6c6514980b1a4ba0039763fd7cb94fb9a974..0ac708c45217f0e7ea22301e52952e04821efe4b 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Verfügbare Module';
+$wb['go_to_txt'] = 'Gehe zu';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
index 95f750a58fd78fe65f3cb18413e9ea8f6b8973ba..6f2064f58dee2bf0a3d1cee68563911945ba0f9f 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_modules.lng b/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
index 4bc94f7cb0d1538697378e5699266c3f33c06f8c..ef088a3bf4e8060cbd49f0a17e8f7c893c28f8d0 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = "Available Modules";
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
index 66987b207ae664f8b8785c82402cd74a5a79b87f..d567f094d3f4450e20e8bb349db9a856cf068ff6 100755
--- a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Módulos disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
index 4d6a5d827af8b51ed8e2ff53c88ad034029a0325..f8f08181b123c40cab3d65d77c414857fb5b355a 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
index 76f2a1f7c5c7f3f31a641964b926e99255a9c6b5..3798185a2b72df50881deec190a0723cf1dcf98e 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupni moduli';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
index 8d6a9949032fcb36de41b78ba5b2171ba41a4cc4..f5d38b5cb7fdaee901f0fb826f9177fc37cdf85f 100644
--- a/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Elérhető Modulok';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
index 6a3a48c12d04662c8d75cbcddf35f6705f6f2208..7ce7159b5711f6e832724bf8dd223befbfab956a 100644
--- a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modul yang tersedia';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
index d9e5cd8c224e803e085743260560f47d18b1728a..69d5c079978cda232d9826df38b6bea5b946b266 100644
--- a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Moduli disponibili';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
index 5b8067f2867b6704f6865ac3d0bc9bd46671e2c1..4788b7d6e6c172cecf297495acfa280873342e51 100644
--- a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Beschikbare modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
index fafcc61480d5019acd02cbc99485e0ea14c2ff1f..6f9b955e6d5e746d26e80143ac9bbd72aa15375b 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostępne moduły';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
index f33ae5719541fc41e5f1af134350f9c960ddf86c..e4ff421beb467e09f834f1a80d07aae381695489 100644
--- a/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Доступные модули';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
index a6f97280440b6028334093bc1c1230209de3e364..4c773920838552e7eab3e719f4f2f4fee8d75a7a 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Tillgängliga moduler';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng b/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..af9fb0294cc0608690a87196e411943b190ce177 100644
--- a/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
index 90de86f128cb6388dc742cacec1a63be397a1df8..c551510a50b61d008ac94abe96b3bd23614b80cb 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Kullanılabilecek Modüller';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php
index defcda08532e74039423b745b743d41d83642819..55833b7ec73f4136980d335b55db4a7f65ec9dca 100644
--- a/interface/web/dns/form/dns_alias.tform.php
+++ b/interface/web/dns/form/dns_alias.tform.php
@@ -88,7 +88,7 @@ $form["tabs"]['dns'] = array (
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'name_error_empty'),
 				1 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 05e915740c9dd69467680148c307109ccaad5c08..d76c403447c9224baa6062c561481318a5564786 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -137,7 +137,7 @@ $form["tabs"]['dns_soa'] = array (
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'mbox_error_empty'),
 				1 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}\.$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\_\+]{0,255}\.$/',
 					'errmsg'=> 'mbox_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index 7d6f17aeeb0024ab232931e10a41f12f5ddd2b50..3da48232d98d0522702c2e09583c3a5e15645392 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -757,6 +757,7 @@ class page_action extends tform_actions {
 		 * Now we have to check, if we should use the domain-module to select the domain
 		 * or not
 		 */
+		$settings = $app->getconf->get_global_config('domains');
 		if ($settings['use_domain_module'] == 'y') {
 			/*
 			 * The domain-module is in use.