diff --git a/main/session/session_add.php b/main/session/session_add.php
index a552bb22ff..b172033ebb 100644
--- a/main/session/session_add.php
+++ b/main/session/session_add.php
@@ -201,8 +201,8 @@ if (api_is_platform_admin()) {
     $form->addElement('hidden', 'id_coach', api_get_user_id());
 }
 
-$form->addElement('advanced_settings','<a class="btn btn-show" id="advanced_parameters" href="javascript://">'.get_lang('AdvancedParameters').'</a>');
-$form->addElement('html','<div id="options" style="display:none">');
+$form->addElement('advanced_settings','<a class="btn btn-show advanced_parameters" id="advanced_params" href="javascript://">'.get_lang('AdvancedParameters').'</a>');
+$form->addElement('html','<div id="advanced_params_options" style="display:none">');
 
 //Dates
 $form->addElement('text', 'display_start_date', array(get_lang('SessionDisplayStartDate'), get_lang('SessionDisplayStartDateComment')), array('id' => 'display_start_date'));
diff --git a/main/template/default/layout/footer.tpl b/main/template/default/layout/footer.tpl
index e817de982b..6faa4ebc14 100644
--- a/main/template/default/layout/footer.tpl
+++ b/main/template/default/layout/footer.tpl
@@ -133,19 +133,15 @@ function mysort(a, b){
     return 0;
 }
 
-var value = 1;
-$("#advanced_parameters").on("click", function() {
-    $("#options").toggle(function() {
-        if (value == 1) {
-            $(".advanced_parameters").addClass("btn-hide");
-            value = 0;
-        } else {
-            $(".advanced_parameters").removeClass("btn-hide");
-            value = 1;
-        }
+$("form").on("click", '.advanced_parameters', function() {
+    var id = $(this).attr('id') + '_options';
+    var button = $(this);
+    $("#"+id).toggle(function() {
+        button.toggleClass('disabled');
     });
 });
 
+
 /** Makes row highlighting possible */
 $(document).ready( function() {
     //Chosen select