diff --git a/app/templates/include/admin_servers.html b/app/templates/include/admin_servers.html
index a46cf620..793a0038 100644
--- a/app/templates/include/admin_servers.html
+++ b/app/templates/include/admin_servers.html
@@ -1,15 +1,5 @@
 {% from 'include/input_macros.html' import input, checkbox, copy_to_clipboard %}
 {% if user_status == 0 or user_plan == 'user' %}
-<script>
-	$( function() {
-		$('select:regex(id, slavefor)').selectmenu("disable");
-		{% if user_status == 0 %}
-			$('#slavefor-th').attr("title", "Actions with the master config will automatically apply on the slave. You are not subscribed. Please subscribe to have access to this feature");
-		{% elif user_plan == 'user' %}
-			$('#slavefor-th').attr("title", "Actions with the master config will automatically apply on the slave. This feature is not available for your plan");
-		{% endif %}
-	});
-</script>
 {% endif %}
 {% if not adding %}
 <table class="overview" id="ajax-servers">
@@ -198,4 +188,15 @@
 	You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=servers" title="Servers description" target="_blank">here</a>
 	or read HowTo in this <a href="https://roxy-wi.org/howto.py?howto=setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
+<script>
+	$( function() {
+		$('select:regex(id, slavefor)').selectmenu();
+		$('select:regex(id, slavefor)').selectmenu("disable");
+		{% if user_status == 0 %}
+			$('#slavefor-th').attr("title", "Actions with the master config will automatically apply on the slave. You are not subscribed. Please subscribe to have access to this feature");
+		{% elif user_plan == 'user' %}
+			$('#slavefor-th').attr("title", "Actions with the master config will automatically apply on the slave. This feature is not available for your plan");
+		{% endif %}
+	});
+</script>
diff --git a/inc/add.js b/inc/add.js
index 1e85f43b..0aea7003 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -1999,7 +1999,7 @@ function changePortCheckFromServerPort() {
 		$($(this)).next().val(iNum);
 	});
 }
-function checkIsServerFiled(select_id, message = 'Choose the server first') {
+function checkIsServerFiled(select_id, message = 'Select a server first') {
 	if ($(select_id).val() == null || $(select_id).val() == '') {
 		toastr.warning(message);
 		return false;