diff --git a/pandora_console/godmode/groups/credential_store.php b/pandora_console/godmode/groups/credential_store.php
index 729a2ff7bd..01e7f11bfa 100644
--- a/pandora_console/godmode/groups/credential_store.php
+++ b/pandora_console/godmode/groups/credential_store.php
@@ -386,6 +386,7 @@ echo '</div>';
                         if (!failed) {
                             dt_<?php echo $table_id; ?>.draw(0);
                             $(".ui-dialog-content").dialog("close");
+                            $('.ui-dialog-content').remove();
                         } else {
                             $(this).dialog('close');
                         }
@@ -406,6 +407,7 @@ echo '</div>';
                     text: '<?php echo __('Cancel'); ?>',
                     click: function(e) {
                         $(this).dialog('close');
+                        $(this).remove();
                     }
                 },
                 {
@@ -462,6 +464,7 @@ echo '</div>';
                             text: '<?php echo __('Cancel'); ?>',
                             click: function(e) {
                                 $(this).dialog('close');
+                                $(this).remove();
                             }
                         },
                         {
@@ -552,6 +555,7 @@ echo '</div>';
                     text: "<?php echo __('Cancel'); ?>",
                     click: function(e) {
                         $(this).dialog('close');
+                        $(this).remove();
                     }
                 },
                 {
diff --git a/pandora_console/include/functions_credential_store.php b/pandora_console/include/functions_credential_store.php
index acc6a2c09f..accc9348fd 100644
--- a/pandora_console/include/functions_credential_store.php
+++ b/pandora_console/include/functions_credential_store.php
@@ -277,7 +277,7 @@ function print_inputs($values=null)
             'id'          => 'id_group',
             'input_class' => 'flex-row',
             'type'        => 'select_groups',
-            'selected'    => $values['id_grupo'],
+            'selected'    => $values['id_group'],
             'return'      => true,
             'class'       => 'w50p',
         ]
@@ -288,6 +288,7 @@ function print_inputs($values=null)
             'name'        => 'product',
             'input_class' => 'flex-row',
             'type'        => 'select',
+            'script'      => 'calculate_inputs()',
             'fields'      => [
                 'CUSTOM' => __('Custom'),
                 'AWS'    => __('Aws'),