diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm
index 4bc742defe..85ae9e8ceb 100644
--- a/C4/Form/MessagingPreferences.pm
+++ b/C4/Form/MessagingPreferences.pm
@@ -140,9 +140,9 @@ sub set_form_values {
             } ( 0..30 ); # FIXME: 30 is a magic number.
         }
         foreach my $transport ( @{$pref->{'transports'}} ) {
-            $option->{'transport_'.$transport} = 'checked="checked"';
+            $option->{'transports_'.$transport} = 1;
         }
-        $option->{'digest'} = 'checked="checked"' if $pref->{'wants_digest'};
+        $option->{'digest'} = 1 if $pref->{'wants_digest'};
     }
     $template->param(messaging_preferences => $messaging_options);
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
index ebb1e264fe..4c51f48a01 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
@@ -59,29 +59,56 @@
       <td>-</td>
       [% END %]
       [% IF ( messaging_preference.transport_sms ) %]
-      [% IF ( SMSSendDriver ) %]<td><input type="checkbox"
-                 id="sms[% messaging_preference.message_attribute_id %]"
-                 name="[% messaging_preference.message_attribute_id %]"
-                 value="sms" [% messaging_preference.transport_sms %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /></td>[% END %]
+        [% IF ( SMSSendDriver ) %]
+        <td>
+          [% IF ( messaging_preference.transports_sms ) %]
+          <input type="checkbox"
+                     id="sms[% messaging_preference.message_attribute_id %]"
+                     name="[% messaging_preference.message_attribute_id %]"
+                     value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+          [% ELSE %]
+          <input type="checkbox"
+                     id="sms[% messaging_preference.message_attribute_id %]"
+                     name="[% messaging_preference.message_attribute_id %]"
+                     value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+          [% END %]
+        </td>
+        [% END %]
       [% ELSE %]
-      <td>-</td>
+        <td>-</td>
       [% END %]
 
       [% IF ( messaging_preference.transport_email ) %]
-      <td><input type="checkbox"
-                 id="email[% messaging_preference.message_attribute_id %]"
-                 name="[% messaging_preference.message_attribute_id %]"
-                 value="email"   [% messaging_preference.transport_email %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      <td>
+        [% IF ( messaging_preference.transports_email ) %]
+        <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+        [% ELSE %]
+        <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+        [% END %]
       </td>
       [% ELSE %]
       <td>-</td>
       [% END %]
 
       [% IF ( messaging_preference.has_digest ) %]
-      <td><input type="checkbox"
+      <td>
+      [% IF ( messaging_preference.digest ) %]
+      <input type="checkbox"
                  id="digest[% messaging_preference.message_attribute_id %]"
                  value="[% messaging_preference.message_attribute_id %]"
-                 name="digest"   [% messaging_preference.digest %] onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+                 name="digest" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      [% ELSE %]
+      <input type="checkbox"
+                 id="digest[% messaging_preference.message_attribute_id %]"
+                 value="[% messaging_preference.message_attribute_id %]"
+                 name="digest" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
+      [% END %]
       </td>
       [% ELSE %]
       <td>-</td>