diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 742976c57a..ad1cf0f380 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -478,8 +478,6 @@ if ($access_console_node === true) {
         $menu_godmode['gservers']['sec2'] = 'godmode/servers/modificar_server';
         $menu_godmode['gservers']['id'] = 'god-servers';
         $sub = [];
-        $sub['godmode/servers/modificar_server']['text'] = __('Manage servers');
-        $sub['godmode/servers/modificar_server']['id'] = 'Manage_servers';
         enterprise_hook('manage_satellite_submenu');
         $menu_godmode['gservers']['sub'] = $sub;
     }
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index e4c5d7aa09..43ab316364 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -34,7 +34,7 @@ require_once $config['homedir'].'/include/functions_graph.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'AW')) {
+if (! check_acl($config['id_user'], 0, 'PM') && ((bool) check_acl($config['id_user'], 0, 'AW') === true && $_GET['server_remote'] === null)) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
         'Trying to access Server Management'
@@ -286,19 +286,21 @@ if (isset($_GET['server']) === true) {
         $id_server
     );
 
-    $buttons = '';
+    $buttons = [];
 
     // Buttons.
-    $buttons = [
-        'standard_editor' => [
-            'active' => false,
-            'text'   => '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$id_server.'&ext='.$ext.'&tab=standard_editor&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('Standard editor')]).'</a>',
-        ],
-        'advanced_editor' => [
-            'active' => false,
-            'text'   => '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$id_server.'&ext='.$ext.'&tab=advanced_editor&pure='.$pure.'">'.html_print_image('images/pen.png', true, ['title' => __('Advanced editor')]).'</a>',
-        ],
-    ];
+    if ((bool) check_acl($config['id_user'], 0, 'PM') === true) {
+        $buttons = [
+            'standard_editor' => [
+                'active' => false,
+                'text'   => '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$id_server.'&ext='.$ext.'&tab=standard_editor&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('Standard editor')]).'</a>',
+            ],
+            'advanced_editor' => [
+                'active' => false,
+                'text'   => '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$id_server.'&ext='.$ext.'&tab=advanced_editor&pure='.$pure.'">'.html_print_image('images/pen.png', true, ['title' => __('Advanced editor')]).'</a>',
+            ],
+        ];
+    }
 
     if ($server_type === SERVER_TYPE_ENTERPRISE_SATELLITE) {
         $buttons['agent_editor'] = [
diff --git a/pandora_console/include/class/SatelliteCollection.class.php b/pandora_console/include/class/SatelliteCollection.class.php
index a1ef24393c..3052abcda9 100644
--- a/pandora_console/include/class/SatelliteCollection.class.php
+++ b/pandora_console/include/class/SatelliteCollection.class.php
@@ -553,7 +553,6 @@ class SatelliteCollection extends HTML
                                     },
                                     datatype: "json",
                                     success: function(data) {
-                                        console.log(data);
                                         showMsg(data);
                                     },
                                     error: function(e) {
@@ -596,7 +595,6 @@ class SatelliteCollection extends HTML
                                     },
                                     datatype: "json",
                                     success: function(data) {
-                                        console.log(data);
                                         showMsg(data);
                                     },
                                     error: function(e) {
@@ -615,7 +613,7 @@ class SatelliteCollection extends HTML
             function showMsg(data) {
                 var title = "<?php echo __('Success'); ?>";
                 var dt_satellite_agents = $("#satellite_collections").DataTable();
-                dt_<?php echo $this->tableId; ?>.draw(false);
+                dt_satellite_agents.draw(false);
 
                 var text = '';
                 var failed = 0;
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 9bca063e6e..493729b737 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -169,6 +169,8 @@ function menu_print_menu(&$menu)
         $sec2 = 'godmode/users/profile_list';
     } else if ($sec2 === 'godmode/users/configure_token') {
         $sec2 = 'godmode/users/token_list';
+    } else if ($sec2 === 'godmode/servers/modificar_server' && check_acl($config['id_user'], 0, 'AW')) {
+        $sec2 = 'enterprise/godmode/servers/list_satellite';
     } else {
         $sec2 = (string) get_parameter('sec2');
     }