diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07e9e935..769f891e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
+## 2.5
+* Bugfix: Saving with checked checkboxes RESCOPED_FROM/TO and BUTTON_TRIGGER was not reflected in GUI.
+
 ## 2.5
 * Bugfix: Avoiding admin page to crash if entering quote as value of a field.
 
diff --git a/src/main/resources/admin.js b/src/main/resources/admin.js
index 9d5cbeb5..cb5395da 100644
--- a/src/main/resources/admin.js
+++ b/src/main/resources/admin.js
@@ -114,7 +114,7 @@
      var $template = $(".prnfb-template-"+formType).clone();
 
      $.each(config, function(fieldIndex,field_map) {
-      var safe_value = field_map.value.replace(/[^a-zA-Z]/g,'');
+      var safe_value = field_map.value.replace(/[^a-zA-Z\_]/g,'');
       $('.variable[data-variable="'+field_map.name+'"]', $template).html(field_map.value);
       $('input[type="text"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
       $('input[type="password"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);