diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm
index 474c25ec9c..86f09dbf55 100644
--- a/C4/Form/MessagingPreferences.pm
+++ b/C4/Form/MessagingPreferences.pm
@@ -121,7 +121,8 @@ sub set_form_values {
     # walk through the options and update them with these borrower_preferences
     my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
     PREF: foreach my $option ( @$messaging_options ) {
-        $option=~ s/ /_/g;
+        $option=~ s/ /\_/g;
+	$option=~ s/\-/\_/g;
         my $pref = C4::Members::Messaging::GetMessagingPreferences( { %{ $target_params }, message_name => $option->{'message_name'} } );
         $option->{ $option->{'message_name'} } = 1;
         # make a hashref of the days, selecting one.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index a0f010722f..caf98f3c7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -31,7 +31,7 @@
           <!-- TMPL_ELSIF NAME="Advance_Notice" -->Advance Notice
           <!-- TMPL_ELSIF NAME="Upcoming_Events" -->Upcoming Events
           <!-- TMPL_ELSIF NAME="Hold_Filled" -->Hold Filled
-          <!-- TMPL_ELSIF NAME="Item_Check-in" -->Item Check-in
+          <!-- TMPL_ELSIF NAME="Item_Check_in" -->Item Check-in
           <!-- TMPL_ELSIF NAME="Item_Checkout" -->Item Checkout
           <!-- TMPL_ELSE -->Unknown <!-- /TMPL_IF --></td>
       <!-- TMPL_IF NAME="takes_days" -->
diff --git a/koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 7aeaa99098..624b14a8f1 100644
--- a/koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -27,12 +27,12 @@
     </tr>
     [% FOREACH messaging_preference IN messaging_preferences %]
     <tr>
-      <td><!-- TMPL_IF NAME="Item Due" -->Item Due
-          <!-- TMPL_ELSIF NAME="Advance Notice" -->Advance Notice
-          <!-- TMPL_ELSIF NAME="Upcoming Events" -->Upcoming Events
-          <!-- TMPL_ELSIF NAME="Hold Filled" -->Hold Filled
-          <!-- TMPL_ELSIF NAME="Item Check-in" -->Item Check-in
-          <!-- TMPL_ELSIF NAME="Item Checkout" -->Item Checkout
+      <td>[% IF ( messaging_preference.Item_Due ) %]Item Due
+          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice
+          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events
+          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled
+          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in
+          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout
           [% ELSE %]Unknown [% END %]</td>
       [% IF ( messaging_preference.takes_days ) %]
       <td>