diff --git a/sites/all/modules/contrib/comment_notify/comment_notify.js b/sites/all/modules/contrib/comment_notify/comment_notify.js
index fe241b3..40d2442 100644
--- a/sites/all/modules/contrib/comment_notify/comment_notify.js
+++ b/sites/all/modules/contrib/comment_notify/comment_notify.js
@@ -1,22 +1,31 @@
 (function ($) {
   Drupal.behaviors.commentNotify = {
     attach: function (context) {
-      $('#edit-notify-type', context).hide();
-      $('#edit-notify', context).bind('change', function() {
-        if ($(this).attr('checked')) {
-          $('#edit-notify-type', context).show();
-          if ($('#edit-notify-type input:checked', context).length == 0) {
-            $('#edit-notify-type input', context)[0].checked = 'checked';
+        
+      //check the status of the checkbox after page is loaded
+      //is the checkbox checked, show form
+      if ($('input[id^=edit-notify]', context).attr('checked') ) {
+          $('div[id^=edit-notify-type]', context).show();          
+          console.log('show form');
+      }
+      else  {
+          //else hide the form
+          $('div[id^=edit-notify-type]', context).hide();
+      }      
+
+      //show hide on checkbox on clicks
+      $('input[id^=edit-notify]', context).bind('change', function() {          
+          //is the checkbox checked, show form
+          if ($('input[id^=edit-notify]', context).attr('checked') ) {
+              $('div[id^=edit-notify-type]', context).show();              
+          }
+          else  {
+              //else hide the form
+              $('div[id^=edit-notify-type]', context).hide();
           }
-        }
-        else {
-          $('#edit-notify-type', context).hide();
-        }
-      });
-      $('#edit-notify', context).trigger('change');
+      });  
     }
   }
 })(jQuery);
 
\ No newline at end of file