diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 19d2d7ff0c..cdeb218fa8 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -28,7 +28,7 @@
 
 // Begin.
 global $config;
-hd($_REQUEST);
+
 check_login();
 
 require_once $config['homedir'].'/vendor/autoload.php';
@@ -1289,16 +1289,17 @@ $session_time .= html_print_input_text(
 $apiToken = '<div class="label_select_simple">';
 $apiToken .= '<p class="edit_user_labels">'.__('API Token');
 $apiToken .= ui_print_help_tip(
-    __('The next string is your passphrase for use with the API instead user/password. Click over the string for renew the token.'),
+    __('The next string is your passphrase for use with the API instead user/password.'),
     true
 ).'</p>';
 $apiToken .= html_print_input_hidden('api_token', $user_info['api_token'], true);
+$apiToken .= '<i>'.$user_info['api_token'].'</i>&nbsp;&nbsp;&nbsp;';
 $apiToken .= sprintf(
-    '<i class="clickable" onClick="javascript:renewAPIToken(\'%s\', \'%s\', \'%s\')">%s</i>',
+    '<i class="button-as-link clickable" onClick="javascript:renewAPIToken(\'%s\', \'%s\', \'%s\')">%s</i>',
     __('Warning'),
     __('The API token will be renewed. After this action, the last token you were using will not work. Are you sure?'),
     'user_profile_form',
-    $user_info['api_token']
+    __('Renew')
 );
 $apiToken .= '</div>';
 
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 443e9dab82..bc589bc763 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -262,12 +262,13 @@ $user_id .= '<span>'.$id.'</span></div>';
 $user_id .= '<div class="label_select_simple"><p class="edit_user_labels">'.__('API Token').': </p>';
 $user_id .= html_print_input_hidden('api_token', $user_info['api_token'], true);
 $user_id .= sprintf(
-    '<i class="clickable" onClick="javascript:renewAPIToken(\'%s\',\'%s\', \'%s\')">%s</i>',
+    '<i class="button-as-link clickable" onClick="javascript:renewAPIToken(\'%s\', \'%s\', \'%s\')">%s</i>',
     __('Warning'),
     __('The API token will be renewed. After this action, the last token you were using will not work. Are you sure?'),
-    'user_mod',
-    $user_info['api_token']
+    'user_profile_form',
+    __('Renew')
 );
+$user_id .= '<br><i>'.$user_info['api_token'].'</i>';
 $user_id .= '</div>';
 
 $full_name = ' <div class="label_select_simple">'.html_print_input_text_extended(