diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 0a7fa9b8e5..e075bb4f9e 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -295,7 +295,7 @@ class DiscoveryTaskList extends Wizard
                             // Check if is a H&D, Cloud or Application.
                             $data[8] = '<a href="'.ui_get_full_url(
                                 sprintf(
-                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&page=0&task=%d',
+                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
                                     $this->getTargetWiz($task),
                                     $task['id_rt']
                                 )
@@ -365,7 +365,10 @@ class DiscoveryTaskList extends Wizard
         // TODO: Do not use description. Use recon_script ID instead.
         switch ($task['description']) {
             case 'Discovery.Application.VMware':
-            return 'wiz=app&mode=vmware';
+            return 'wiz=app&mode=vmware&page=0';
+
+            case CLOUDWIZARD_AWS_DESCRIPTION:
+            return 'wiz=cloud&mode=amazonws&page=1';
 
             default:
             return 'wiz=hd&mode=netscan';
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index 685bb06851..ba057475e3 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -3,6 +3,9 @@
 /**
  * Interfaz tope gama que obliga a implementar metodos.
  */
+
+define('CLOUDWIZARD_AWS_DESCRIPTION', 'Discovery.Cloud.AWS.EC2');
+
 class Wizard
 {