diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index fa6b01baf1..c4ea505df7 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-03  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/users/configure_user.php: improve the meta
+	setup screen hidding assigned server field when the
+	agent management is not checked
+
 2013-07-02  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_api.php: Changed the way of encode
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 92e69e3233..784853131b 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -506,7 +506,7 @@ if($meta) {
 	$table->data['metaconsole_agents_manager'] = $data;
 		
 	$data = array();
-	$data[0] = __('Assigned node'). ui_print_help_tip(__('Server where the agents managed of this user will be placed'), true);
+	$data[0] = __('Assigned node'). ui_print_help_tip(__('Server where the agents created of this user will be placed'), true);
 	$servers = metaconsole_get_servers();
 	$servers_for_select = array();
 	foreach($servers as $server) {
@@ -663,7 +663,17 @@ $(document).ready (function () {
 		}
 	});
 	
+	$('#checkbox-metaconsole_agents_manager').change(function() {
+		if($('#checkbox-metaconsole_agents_manager').prop('checked')) {			
+			$('#user_configuration_table-metaconsole_assigned_server').show();
+		}
+		else {			
+			$('#user_configuration_table-metaconsole_assigned_server').hide();
+		}
+	});
+	
 	$('input:radio[name="is_admin"]').trigger('change');
+	$('#checkbox-metaconsole_agents_manager').trigger('change');
 });
 /* ]]> */
 </script>