diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 635d208008..1a4ed984e0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Ramon Novoa  <rnovoa@artica.es>
+
+	* godmode/setup/setup.php: Ask for confirmation before enabling
+	  'Enforce https' since access to Pandora FMS Console may be lost.
+
 2010-06-01  Sergio Martin <sergio.martin@artica.es>
 
 	* include/FusionCharts/FusionCharts_Gen.php: Fixed the
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index ba4ce72c05..fa99cef63c 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -89,7 +89,7 @@ $table->data[10][1] = __('Yes').'&nbsp;'.print_radio_button ('autoupdate', 1, ''
 $table->data[10][1] .= __('No').'&nbsp;'.print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
 
 $table->data[11][0] = __('Enforce https');
-$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button ('https', 1, '', $config["https"], true).'&nbsp;&nbsp;';
+$table->data[11][1] = __('Yes').'&nbsp;'.print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
 $table->data[11][1] .= __('No').'&nbsp;'.print_radio_button ('https', 0, '', $config["https"], true);