diff --git a/ChangeLog b/ChangeLog
index cdc8dbc3350..d0608cadb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
 - Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
 - Fix: [ bug #1830 ] Salaries payment only allows checking accounts
+- Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index e730a1ed45b..c9773372e93 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -144,12 +144,19 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 				foreach ($showextcals as $val)
 				{
 					$htmlname = dol_string_nospecial($val['name']);
+
 					print '<tr><td>';
 					print '<script type="text/javascript">' . "\n";
+
+					//jQuery Learning "How do I select an element by an ID that has characters used in CSS notation?"
+					//http://learn.jquery.com/using-jquery-core/faq/how-do-i-select-an-element-by-an-id-that-has-characters-used-in-css-notation/
+					print '	function jq( myid ) {
+					    return myid.replace( /(:|\.|\[|\]|,|@)/g, "\\\\$1" );
+					}';
+
 					print 'jQuery(document).ready(function () {' . "\n";
-					print '		jQuery("#check_' . $htmlname . '").click(function() {';
-					print ' 		/* alert("'.$htmlname.'"); */';
-					print ' 		jQuery(".family_' . $htmlname . '").toggle();';
+					print '		jQuery("#check_" + jq("'.$htmlname.'")).click(function() {';
+					print ' 		jQuery(".family_" + jq("'.$htmlname.'")).toggle();';
 					print '		});' . "\n";
 					print '});' . "\n";
 					print '</script>' . "\n";