diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index c3d8c5b210d5df66bb4e02a69368c334b69e6e58..1f24433da346116b8df11a818a8b045625fc19b4 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,2 +1,4 @@
 
 ALTER TABLE `mail_user` CHANGE `quota` `quota` BIGINT(20) NOT NULL DEFAULT '0';
+ALTER TABLE `server_php` ADD `sortprio` INT(20) NOT NULL DEFAULT '100' AFTER `active`;
+
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index e9ed67c86a441cca00f6bcd898eaa92b58361725..2055c6a9a3371d171adebbde53ac9cdff57e904f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1460,6 +1460,7 @@ CREATE TABLE `server_php` (
   `php_fpm_pool_dir` varchar(255) DEFAULT NULL,
   `php_fpm_socket_dir` varchar(255) DEFAULT NULL,
   `active` enum('n','y') NOT NULL DEFAULT 'y',
+  `sortprio` int(20) NOT NULL DEFAULT 100,
   PRIMARY KEY (`server_php_id`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index 2a37a1e6d1e66ecaebe10c8eeef22e77f1c27902..67f22cbeb43277931f7451d89a135319b13de5c7 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.tform.php
@@ -248,4 +248,20 @@ $form["tabs"]['php_fpm'] = array(
 		//#################################
 	)
 );
+$form["tabs"]['php_sort'] = array (
+    	'title' => "PHP Sort Priority",
+	'width' => 80,
+	'template' => "templates/server_php_sort_edit.htm",
+	'fields' => array(
+                   'sortprio' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'default' => '100',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '20'
+		),
+	)
+);
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ar_server_php.lng
+++ b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_php_list.lng b/interface/web/admin/lib/lang/ar_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ar_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ar_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/bg_server_php.lng
+++ b/interface/web/admin/lib/lang/bg_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_php_list.lng b/interface/web/admin/lib/lang/bg_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/bg_server_php_list.lng
+++ b/interface/web/admin/lib/lang/bg_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng
index d0a1015833f82dfd9c183a1928e02dacfd690e8c..791db7e3ec70cde55a0ac003fb7738f64942020e 100644
--- a/interface/web/admin/lib/lang/br_server_php.lng
+++ b/interface/web/admin/lib/lang/br_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Ativo';
 $wb['php_in_use_error'] = 'Esta versão PHP está em uso.';
 $wb['php_name_in_use_error'] = 'O nome não pode ser modificado.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ca_server_php.lng
+++ b/interface/web/admin/lib/lang/ca_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_server_php_list.lng b/interface/web/admin/lib/lang/ca_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ca_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ca_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index c1c67f05ef6673858a11f164aa5a2e0f6d483c0c..64909284298ba7f655b2c7a33e68e299a7620b6c 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Aktivní';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
index b3ad5d991331f2ed1f932f7e271544e3e00f1ce6..4100957b9d336884d26b935487bc1f8a79c48344 100644
--- a/interface/web/admin/lib/lang/de_server_php.lng
+++ b/interface/web/admin/lib/lang/de_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Aktiv';
 $wb['php_in_use_error'] = 'Diese PHP-Version wird noch benutzt.';
 $wb['php_name_in_use_error'] = 'Der Name kann nicht geändert werden.';
+$wb['PHP Sort Priority'] = 'Priorität';
+$wb['sortprio_txt'] = 'Sorting Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP Version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_php_list.lng b/interface/web/admin/lib/lang/de_server_php_list.lng
index f9da54d84c90b58a7b97bb8f9bd6439be9b8f933..6b0a08474664bbfdcb04d95b9189d459c835679a 100644
--- a/interface/web/admin/lib/lang/de_server_php_list.lng
+++ b/interface/web/admin/lib/lang/de_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kunde';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Aktiv';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng
index db6ef1f98a2f0f2e7955afb872f06583c2a53922..e9b42a51334a4f9868e6d9eee0099ea398194d9c 100644
--- a/interface/web/admin/lib/lang/dk_server_php.lng
+++ b/interface/web/admin/lib/lang/dk_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_server_php_list.lng b/interface/web/admin/lib/lang/dk_server_php_list.lng
index 65869ce2ed3dd1f042a4d9e5e27427fbdeed1c4a..4be3b3446b8749e98a33582ff244a3eca0daaf69 100644
--- a/interface/web/admin/lib/lang/dk_server_php_list.lng
+++ b/interface/web/admin/lib/lang/dk_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kunde';
 $wb['name_txt'] = 'PHP Navn';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/el_server_php.lng
+++ b/interface/web/admin/lib/lang/el_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php_list.lng b/interface/web/admin/lib/lang/el_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/el_server_php_list.lng
+++ b/interface/web/admin/lib/lang/el_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/en_server_php.lng
+++ b/interface/web/admin/lib/lang/en_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_php_list.lng b/interface/web/admin/lib/lang/en_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/en_server_php_list.lng
+++ b/interface/web/admin/lib/lang/en_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng
index df2f0778f486de1bbd1b494a37270dc4e7518c2b..e75aa0e4e472095332f3994c901787fd4ae6f120 100644
--- a/interface/web/admin/lib/lang/es_server_php.lng
+++ b/interface/web/admin/lib/lang/es_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_php_list.lng b/interface/web/admin/lib/lang/es_server_php_list.lng
index 8d62ee891926fd8ee2b32de02b10ae8bc3b6c093..1efd239d31467472a2039cb7a7d01cda059333ed 100644
--- a/interface/web/admin/lib/lang/es_server_php_list.lng
+++ b/interface/web/admin/lib/lang/es_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['name_txt'] = 'Versión de PHP';
 $wb['server_id_txt'] = 'Servidor';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/fi_server_php.lng
+++ b/interface/web/admin/lib/lang/fi_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_php_list.lng b/interface/web/admin/lib/lang/fi_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/fi_server_php_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/fr_server_php.lng
+++ b/interface/web/admin/lib/lang/fr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_php_list.lng b/interface/web/admin/lib/lang/fr_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/fr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
index 15ec1b30f533c17414ed1908236ba4ee12561a16..9db79d4f9b727891c49319105f3ba293d3b452d3 100644
--- a/interface/web/admin/lib/lang/hr_server_php.lng
+++ b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_php_list.lng b/interface/web/admin/lib/lang/hr_server_php_list.lng
index 1851ac8395305bf7c9aac965656ac56cbe766b12..4e5381c1f36c8504ff2c83544f88a18fb702f5b7 100644
--- a/interface/web/admin/lib/lang/hr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Klijent';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/hu_server_php.lng
+++ b/interface/web/admin/lib/lang/hu_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_php_list.lng b/interface/web/admin/lib/lang/hu_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/hu_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hu_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/id_server_php.lng
+++ b/interface/web/admin/lib/lang/id_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_php_list.lng b/interface/web/admin/lib/lang/id_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/id_server_php_list.lng
+++ b/interface/web/admin/lib/lang/id_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
index 7569ba9b5215c7bbdb3ecfd5eab10c5a2b8e544f..d4feb7cb0c3232c8aec6c8048c5a437dd5abd3e5 100644
--- a/interface/web/admin/lib/lang/it_server_php.lng
+++ b/interface/web/admin/lib/lang/it_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Attivo';
 $wb['php_in_use_error'] = 'Questa versione PHP è in uso.';
 $wb['php_name_in_use_error'] = 'Il nome non può essere cambiato.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php_list.lng b/interface/web/admin/lib/lang/it_server_php_list.lng
index 5ff1ebe31460dad547308f710edbd3e25769195b..ca117bf38ab8c2af483a6df59d02a615331f7645 100644
--- a/interface/web/admin/lib/lang/it_server_php_list.lng
+++ b/interface/web/admin/lib/lang/it_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Cliente';
 $wb['name_txt'] = 'Nome PHP';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ja_server_php.lng
+++ b/interface/web/admin/lib/lang/ja_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_php_list.lng b/interface/web/admin/lib/lang/ja_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ja_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ja_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/nl_server_php.lng
+++ b/interface/web/admin/lib/lang/nl_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_php_list.lng b/interface/web/admin/lib/lang/nl_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/nl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index de4ce60ac1af074b470fa993c661b8890cd3d4db..d86e2cf01ff0d53b779b690c8f072c6adf927ed4 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/pt_server_php.lng
+++ b/interface/web/admin/lib/lang/pt_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_php_list.lng b/interface/web/admin/lib/lang/pt_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/pt_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pt_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/ro_server_php.lng
+++ b/interface/web/admin/lib/lang/ro_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_php_list.lng b/interface/web/admin/lib/lang/ro_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/ro_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ro_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng
index c5c4942b8e08ebf2cbfdba21300d413857356c1d..ca1a8147a3e1739267f95d5db2577fa8e64a50b4 100644
--- a/interface/web/admin/lib/lang/ru_server_php.lng
+++ b/interface/web/admin/lib/lang/ru_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_php_list.lng b/interface/web/admin/lib/lang/ru_server_php_list.lng
index 5be582f23daf324d4ba7e90203d074a73a081641..1a2068057fa35c4e7e49fbe199b0142dde62dbba 100644
--- a/interface/web/admin/lib/lang/ru_server_php_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'ID Клиента';
 $wb['name_txt'] = 'Имя PHP';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/se_server_php.lng
+++ b/interface/web/admin/lib/lang/se_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_php_list.lng b/interface/web/admin/lib/lang/se_server_php_list.lng
index b2f8b5511219e8538d8e1ad32d24d01c0d656245..86adb0f2a62620545ff9f55a238998ade7abd146 100644
--- a/interface/web/admin/lib/lang/se_server_php_list.lng
+++ b/interface/web/admin/lib/lang/se_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Kund';
 $wb['name_txt'] = 'PHP-namn';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng
index 491be1aae2ecd613527e187940420d748137ed86..4d71bb50b7269cea5394e2df229b5d94d42bcb5c 100644
--- a/interface/web/admin/lib/lang/sk_server_php.lng
+++ b/interface/web/admin/lib/lang/sk_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Active';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_php_list.lng b/interface/web/admin/lib/lang/sk_server_php_list.lng
index 291302cbb72f6b6ac12dc3e6cb95f18e9dcde90f..d5e6ad3c7fe29f2028a364c91236d7d671c0199c 100644
--- a/interface/web/admin/lib/lang/sk_server_php_list.lng
+++ b/interface/web/admin/lib/lang/sk_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Client';
 $wb['name_txt'] = 'PHP Name';
 $wb['active_txt'] = 'Active';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
index 71b130e3d25bcf8ef9d8a553932416ed13b197b6..914d28f167314f3fc6b10ec070f44cd4fa4f1a03 100644
--- a/interface/web/admin/lib/lang/tr_server_php.lng
+++ b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -17,4 +17,7 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
 $wb['active_txt'] = 'Etkin';
 $wb['php_in_use_error'] = 'This PHP-Version is in use.';
 $wb['php_name_in_use_error'] = 'The name can not be changed.';
+$wb['PHP Sort Priority'] = 'Priority';
+$wb['sortprio_txt'] = 'Priority';
+$wb['sortprio_long_txt'] = 'Priority of PHP version in the PHP version select box<br>Default PHP has prio 0 if enabled<br>Lower value is higher priority';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php_list.lng b/interface/web/admin/lib/lang/tr_server_php_list.lng
index 4468e7ead9ba1e7695c6c5125884a91c12624e51..82fb3cc32e69c0931fb572b496b43bb538141d32 100644
--- a/interface/web/admin/lib/lang/tr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/tr_server_php_list.lng
@@ -6,4 +6,5 @@ $wb['client_id_txt'] = 'Müşteri';
 $wb['name_txt'] = 'PHP Adı';
 $wb['active_txt'] = 'Etkin';
 $wb['usage_txt'] = 'Usage count';
+$wb['sortprio_txt'] = 'Priority';
 ?>
diff --git a/interface/web/admin/list/firewall.list.php b/interface/web/admin/list/firewall.list.php
index 4835cb9d4ac0ce18ac81f10f38825396603dc00f..884779110a908577ad81747f280b9de288eb4dde 100644
--- a/interface/web/admin/list/firewall.list.php
+++ b/interface/web/admin/list/firewall.list.php
@@ -57,11 +57,11 @@ $liste["item"][] = array( 'field'  => "active",
 	'value'  => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt')));
 
 $liste["item"][] = array( 'field'  => "server_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
 		'keyfield'=> 'server_id',
diff --git a/interface/web/admin/list/remote_user.list.php b/interface/web/admin/list/remote_user.list.php
index de11f0d9a1d78ffbd207251f383474cceb884a4f..7dc0fbf430c078c06a13b40ec6fa725ad0cb33f3 100644
--- a/interface/web/admin/list/remote_user.list.php
+++ b/interface/web/admin/list/remote_user.list.php
@@ -35,7 +35,7 @@ $liste['auth'] = 'yes';
 
 $liste['item'][] = array(
 	'field'      => 'remote_userid',
-	'datatype'   => 'INTEGER',
+	'datatype'   => 'VARCHAR',
 	'formtype'   => 'SELECT',
 	'op'         => '=',
 	'prefix'     => '',
diff --git a/interface/web/admin/list/server_php.list.php b/interface/web/admin/list/server_php.list.php
index 4ea40bdae1727c859392544946f5eab7390461d3..a4a38901ab4565bf9f704265e240b280f2c5bacb 100644
--- a/interface/web/admin/list/server_php.list.php
+++ b/interface/web/admin/list/server_php.list.php
@@ -39,9 +39,6 @@ $liste['paging_tpl']  = 'templates/paging.tpl.htm';
 //* Enable auth
 $liste['auth']    = 'no';
 
-// mark columns for php sorting (no real mySQL columns)
-$liste["phpsort"] = array('usage');
-
 
 /*****************************************************
 * Suchfelder
diff --git a/interface/web/admin/server_config_edit.php b/interface/web/admin/server_config_edit.php
index c19433b0e4da1e21ebb2e4cea062f938f6bcbc0a..32aa270893f467ea3448a0d3940a6cc7832fec81 100644
--- a/interface/web/admin/server_config_edit.php
+++ b/interface/web/admin/server_config_edit.php
@@ -125,7 +125,7 @@ class page_action extends tform_actions {
 	function onShowEnd() {
 		global $app;
 		
-		$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ? AND ((SELECT COUNT(*) FROM server) >= 1)", $this->id);
+		$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ? AND ((SELECT COUNT(*) FROM server) > 1)", $this->id);
 		$app->tpl->setVar('server_name', $app->functions->htmlentities($tmp['server_name']));
 		unset($tmp);
 
diff --git a/interface/web/admin/server_php_edit.php b/interface/web/admin/server_php_edit.php
index a9e7b38bbb5b0d10335bffea920a847dd5347b9f..8ad055624dfb6b5c63b8691cbd0e2111679f2669 100644
--- a/interface/web/admin/server_php_edit.php
+++ b/interface/web/admin/server_php_edit.php
@@ -54,7 +54,13 @@ class page_action extends tform_actions {
 		parent::onSubmit();
 	}
 	function onBeforeUpdate() {
-		global $app;
+                
+                global $app;
+                
+                //check if Prio tab got update/save if yes disable datalog update - not needed
+                if(isset($this->dataRecord["sortprio"])) {
+                        $app->tform->formDef['db_history'] = 'no';
+                }
 
 		//* Check if the server has been changed
 		// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index a2595a84741a2b729a1f55e12af7e5b1f09ce3f1..5f6fae91dbba86f7ae32581f55b55a6afc98a0be 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -19,6 +19,7 @@
                         <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
                         <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
                         <th data-column="name"><tmpl_var name="name_txt"></th>
+                        <th class="small-col" data-column="sortprio"><tmpl_var name="sortprio_txt"></th>
                         <th data-column="usage"><tmpl_var name="usage_txt"></th>
                         <th class="text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
@@ -27,7 +28,7 @@
                         <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
                         <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
-                        <td></td>
+                        <td></td><td></td>
                         <td class="text-right">
                             <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/server_php_list.php"><span class="icon icon-filter"></span></button>
                         </td>
@@ -40,7 +41,8 @@
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
                             <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
-                            <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="usage"}</a></td>
+                            <td class="text-center"><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sortprio"}</a></td>
+                            <td class="text-center"><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="usage"}</a></td>
                             <td class="text-right">
                                 <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/server_php_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
                             </td>
diff --git a/interface/web/admin/templates/server_php_sort_edit.htm b/interface/web/admin/templates/server_php_sort_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c7ca24adfaf9c5a3e782fb1bdbe0b75dee004c2a
--- /dev/null
+++ b/interface/web/admin/templates/server_php_sort_edit.htm
@@ -0,0 +1,11 @@
+            <div class="form-group">
+                <label for="name" class="col-sm-3 control-label">{tmpl_var name='sortprio_txt'}</label>
+                <div class="col-sm-9"><input type="number" name="sortprio" id="sortprio" data-html="true" data-toggle="tooltip" data-placement="top"  title="{tmpl_var name='sortprio_long_txt'}" value="{tmpl_var name='sortprio'}" class="form-control" /></div>
+            </div>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="clear"><div class="right">
+            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_php_edit.php">{tmpl_var name='btn_save_txt'}</button>
+            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+        </div></div>
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 936a584f20d90f3754e1b9391abb9127ef841afa..f1d8433c8abbe3ec8ef00c8c18b9d0247c784809 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -64,7 +64,7 @@ if($type == 'getserverid'){
 }
 
 if($type == 'getserverphp'){
-	$json = '{';
+	$json = '{"phpversion":['; //Wrap Objects into Array because chrome reorder objects itself
 
 	$server_type = 'apache';
 	$web_config = $app->getconf->get_server_config($server_id, 'web');
@@ -74,10 +74,10 @@ if($type == 'getserverphp'){
 
 	//* Client: If the logged in user is not admin and has no sub clients (no reseller)
 	if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-		$sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($_SESSION["s"]["user"]["client_id"]) . ")";
+		$sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($_SESSION["s"]["user"]["client_id"]) . ") ORDER BY sortprio";
 		//* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
 	} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-		$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $client_group_id);
+		$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ? ORDER BY sortprio", $client_group_id);
 		//$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
 		$sql_where = " AND (client_id = 0";
 		if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
@@ -89,7 +89,7 @@ if($type == 'getserverphp'){
 		//$sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"];
 		$sql_where = " AND (client_id = 0";
 		if($app->functions->intval($client['client_id']) > 0) $sql_where .= " OR client_id = ".$app->functions->intval($client['client_id']);
-		$sql_where .= ")";
+		$sql_where .= ") ORDER BY sortprio";
 	}
 
 	$php_records = array();
@@ -98,10 +98,11 @@ if($type == 'getserverphp'){
 	} elseif($php_type == 'fast-cgi'){
 		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'".$sql_where, $server_id);
 	}
+        $usePHPDefault=false;
+        $usePHPDefaultDone=false;
 	if (empty($web_config['php_default_hide']) || 'n' === $web_config['php_default_hide']) {
-		$php_records[]=array('name' => $app->functions->htmlentities($web_config['php_default_name']));
+                $usePHPDefault=true;
 	}
-	uasort($php_records, 'sort_php');
 	$php_select = "";
 	if(is_array($php_records) && !empty($php_records)) {
 		foreach( $php_records as $php_record) {
@@ -110,16 +111,17 @@ if($type == 'getserverphp'){
 			} else {
 				$php_version = $php_record['server_php_id'];
 			}
-			if($php_record['name'] != $web_config['php_default_name']) {
-				$json .= '"'.$php_version.'": "'.$php_record['name'].'",';
-			} else {
-				$json .= '"0": "'.$php_record['name'].'",';
-			}
+                        if ($php_record['sortprio'] > 0 && $usePHPDefault && $usePHPDefaultDone == false)  //if DefaultPHP is enable insert it on virtual position 0
+                        {
+                            $json .= '{"0": "'.$web_config['php_default_name'].'"},';
+                            $usePHPDefaultDone = true;
+                        }
+			$json .= '{"'.$php_version.'": "'.$php_record['name'].'"},';
 		}
 	}
 	unset($php_records);
 	if(substr($json, -1) == ',') $json = substr($json, 0, -1);
-	$json .= '}';
+	$json .= ']}';
 }
 
 if($type == 'getphptype'){
diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php
index 55c582eeda06ee701372ec4a9b719adde6ad7cd9..60b26bc767ce3968098d9fc9deb5e2b5bfe54b66 100644
--- a/interface/web/sites/database_edit.php
+++ b/interface/web/sites/database_edit.php
@@ -369,7 +369,7 @@ class page_action extends tform_actions {
 			} else {
 				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
 			}
-			if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }
+			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){
@@ -459,7 +459,7 @@ class page_action extends tform_actions {
 				$remote_ips = explode(",", $global_config['default_remote_dbserver']);
 			}
 			
-			if (!in_array($server_config['ip_address'], $remote_ips)) { $remote_ips[] = $server_config['ip_address']; }
+			if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; }
 
 			if($server_config['ip_address']!='') {
 				if($this->dataRecord['remote_access'] != 'y'){
diff --git a/interface/web/sites/form/web_childdomain.tform.php b/interface/web/sites/form/web_childdomain.tform.php
index 36718f5c9d4c5571cf2f904bb23be8d291dc2497..6d4f96e4370635ff748363ce8bce0ed994c99d5c 100644
--- a/interface/web/sites/form/web_childdomain.tform.php
+++ b/interface/web/sites/form/web_childdomain.tform.php
@@ -168,7 +168,7 @@ if($childdomain_type == 'aliasdomain') {
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.domain.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
+			'value'  => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
 		);
 
 }
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
index ba0d86f3eb892e1fdcf6e379b481198949847f97..5c26f8254d5ac0029662687382881a776a838235 100644
--- a/interface/web/sites/form/web_vhost_domain.tform.php
+++ b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -417,7 +417,7 @@ $form["tabs"]['redirect'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.domain.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
+			'value'  => array('' => 'no_redirect_txt', 'non_www_to_www' => 'domain.tld => www.domain.tld', 'www_to_non_www' => 'www.domain.tld => domain.tld', '*_domain_tld_to_domain_tld' => '*.doman.tld => domain.tld', '*_domain_tld_to_www_domain_tld' => '*.domain.tld => www.domain.tld', '*_to_domain_tld' => '* => domain.tld', '*_to_www_domain_tld' => '* => www.domain.tld')
 		),
 		'rewrite_rules' => array (
 			'datatype' => 'TEXT',
diff --git a/interface/web/sites/list/cron.list.php b/interface/web/sites/list/cron.list.php
index ac5513ad9a9652dd64870e2ff1a929e224b02fcf..fc8c9691a63181094f68e4b8742eb0725a8c247c 100644
--- a/interface/web/sites/list/cron.list.php
+++ b/interface/web/sites/list/cron.list.php
@@ -59,11 +59,11 @@ $liste["item"][] = array( 'field'  => "active",
 
 
 $liste["item"][] = array( 'field'  => "server_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
 		'keyfield'=> 'server_id',
@@ -73,7 +73,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array(   'field'     => "parent_domain_id",
-	'datatype'  => "INTEGER",
+	'datatype'  => "VARCHAR",
 	'formtype'  => "SELECT",
 	'op'        => "=",
 	'prefix'    => "",
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
index 438837ffc95f6eb652b9aa43fedb20292a25f4d4..25e1b8de7f3811e6ef3a7bc51a1d459c445b572e 100644
--- a/interface/web/sites/list/database.list.php
+++ b/interface/web/sites/list/database.list.php
@@ -103,9 +103,9 @@ if($_SESSION['s']['user']['typ'] == 'admin') {
 $liste["item"][] = array( 'field'  => "server_id",
 	'datatype' => "INTEGER",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT a.server_id, a.server_name FROM server a, web_database b WHERE (a.server_id = b.server_id) AND ({AUTHSQL-B}) ORDER BY a.server_name',
 		'keyfield'=> 'server_id',
@@ -115,7 +115,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array( 'field'  => "parent_domain_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
 	),
diff --git a/interface/web/sites/list/ftp_user.list.php b/interface/web/sites/list/ftp_user.list.php
index d754ac07a563b16667f45d354cf5e8b1cbc76803..20a8a327acb60feaf76877a4da1a085a7ab44267 100644
--- a/interface/web/sites/list/ftp_user.list.php
+++ b/interface/web/sites/list/ftp_user.list.php
@@ -61,9 +61,9 @@ $liste["item"][] = array( 'field'  => "active",
 $liste["item"][] = array( 'field'  => "server_id",
 	'datatype' => "INTEGER",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT a.server_id, a.server_name FROM server a, ftp_user b WHERE (a.server_id = b.server_id) AND ({AUTHSQL-B}) ORDER BY a.server_name',
 		'keyfield'=> 'server_id',
@@ -73,7 +73,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array( 'field'  => "parent_domain_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
 	),
diff --git a/interface/web/sites/list/shell_user.list.php b/interface/web/sites/list/shell_user.list.php
index 08fa344d859b095179184bf9beda8b10d21b3120..3f51082d6e99b5446568a084d4a05a2a6f613865 100644
--- a/interface/web/sites/list/shell_user.list.php
+++ b/interface/web/sites/list/shell_user.list.php
@@ -59,11 +59,11 @@ $liste["item"][] = array( 'field'  => "active",
 
 
 $liste["item"][] = array( 'field'  => "server_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
 		'keyfield'=> 'server_id',
@@ -73,7 +73,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array( 'field'  => "parent_domain_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
 	),
diff --git a/interface/web/sites/list/web_childdomain.list.php b/interface/web/sites/list/web_childdomain.list.php
index c9760662d775e3a2990664c5a0805bf67431f8d2..202744e8de522feb60f5a1d23771c3549f27b7a3 100644
--- a/interface/web/sites/list/web_childdomain.list.php
+++ b/interface/web/sites/list/web_childdomain.list.php
@@ -61,9 +61,9 @@ $liste["item"][] = array( 'field'  => "active",
 $liste["item"][] = array( 'field'  => "server_id",
 	'datatype' => "INTEGER",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT a.server_id, a.server_name FROM server a, web_domain b WHERE (a.server_id = b.server_id) AND ({AUTHSQL-B}) ORDER BY a.server_name',
 		'keyfield'=> 'server_id',
diff --git a/interface/web/sites/list/web_folder.list.php b/interface/web/sites/list/web_folder.list.php
index c881bfc9480e08d8386bde4830746c2228b207ea..dc2fb0418acddfb631520d186cab114f63d9fac3 100644
--- a/interface/web/sites/list/web_folder.list.php
+++ b/interface/web/sites/list/web_folder.list.php
@@ -59,11 +59,11 @@ $liste["item"][] = array( 'field'  => "active",
 
 
 $liste["item"][] = array( 'field'  => "server_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
 		'keyfield'=> 'server_id',
@@ -73,7 +73,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array( 'field'  => "parent_domain_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
 	),
diff --git a/interface/web/sites/list/web_folder_user.list.php b/interface/web/sites/list/web_folder_user.list.php
index a6f50fa2a4b611b80fc1899a042f3132eb5d67fb..f0a1cd8ad29481f819d212986e09c252da5084b9 100644
--- a/interface/web/sites/list/web_folder_user.list.php
+++ b/interface/web/sites/list/web_folder_user.list.php
@@ -61,7 +61,7 @@ $liste["item"][] = array( 'field'  => "active",
 
 
 $liste["item"][] = array( 'field'  => "web_folder_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')
 	),
diff --git a/interface/web/sites/list/webdav_user.list.php b/interface/web/sites/list/webdav_user.list.php
index 66e8a221a0415fa8ce56027bb32cbf6dcdeef9fe..04b772d15683448d4654fc5cfa18602a19f854b3 100644
--- a/interface/web/sites/list/webdav_user.list.php
+++ b/interface/web/sites/list/webdav_user.list.php
@@ -59,11 +59,11 @@ $liste["item"][] = array( 'field'  => "active",
 
 
 $liste["item"][] = array( 'field'  => "server_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
+	'op'  => "like",
+	'prefix' => "%",
+	'suffix' => "%",
 	'datasource' => array (  'type' => 'SQL',
 		'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} and mirror_server_id = 0 ORDER BY server_name',
 		'keyfield'=> 'server_id',
@@ -73,7 +73,7 @@ $liste["item"][] = array( 'field'  => "server_id",
 	'value'  => "");
 
 $liste["item"][] = array( 'field'  => "parent_domain_id",
-	'datatype' => "INTEGER",
+	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
 	'op'  => "=",
 	'prefix' => "",
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index c4421aac74b282d0934a234ad13df5bc5a1b1804..356e03e2dc608ed9fbb6a2baa45e49c4c7c2362f 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -456,7 +456,9 @@
             //var options = '<option value="">Default</option>';
 			var options = '';
             var serverphpidselected = '';
-            $.each(data, function(key, val) {
+            $.each(data.phpversion, function(akey,aval) {
+                key=Object.getOwnPropertyNames(aval)[0];
+                val=aval[key];
 				<tmpl_if name="id">
                 if($('#server_php_id').val() == key){
                     serverphpidselected = ' selected="selected"';