diff --git a/interface/web/sites/form/web_vhost_aliasdomain.tform.php b/interface/web/sites/form/web_vhost_aliasdomain.tform.php
index 00313fb743b4a840617e0e0543f4f8d59b46923d..1b877a645ebb3aee401a22364cba044961fc7146 100644
--- a/interface/web/sites/form/web_vhost_aliasdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_aliasdomain.tform.php
@@ -143,9 +143,7 @@ $form["tabs"]['domain'] = array (
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
-				// Commented out until {AUTHSQL::web_domain} is working
-				//'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
+				'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
 				'keyfield'=> 'domain_id',
 				'valuefield'=> 'parent_domain'
 			),
diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php
index b3c146cbaad09c98153c180533b787b46a9cd289..de2fba800ac0265c1ea4049f181600ad798130f5 100644
--- a/interface/web/sites/form/web_vhost_subdomain.tform.php
+++ b/interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -143,9 +143,7 @@ $form["tabs"]['domain'] = array (
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => "SELECT domain_id,domain AS parent_domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
-				// Commented out until {AUTHSQL::web_domain} is working
-				//'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
+				'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
 				'keyfield'=> 'domain_id',
 				'valuefield'=> 'parent_domain'
 			),
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 37841c2fdf1c8f955c963a4db96243a325315e7b..8d6ffde13cc1e8af8574abd15349282a001ee6a4 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -14,7 +14,6 @@
         <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
         <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
         <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
-        <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
         <script type="text/javascript" src="js/scrigo.js.php"></script>
         <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
         <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>