diff --git a/koha-tmpl/intranet-tmpl/prog/css/preferences.css b/koha-tmpl/intranet-tmpl/prog/css/preferences.css
index 2745deda46..60114036c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/preferences.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/preferences.css
@@ -1,3 +1,4 @@
+.preference-email,
 .preference-url,
 .preference-multi,
 .preference-long,
@@ -6,7 +7,7 @@
     width: 20em;
 }
 
-.preference-short, .preference-email {
+.preference-short {
     width: 10em;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 157bbea997..7d4b42fcc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -393,6 +393,7 @@ Circulation:
         -
             - "Send all notices as a BCC to this email address:"
             - pref: NoticeBcc
+              class: email
         -
             - pref: OverdueNoticeCalendar
               choices:
@@ -947,6 +948,7 @@ Circulation:
         -
             - "Fallback email address for staff ILL notices to be sent to in the absence of a library address:"
             - pref: ILLDefaultStaffEmail
+              class: email
     Fines Policy:
         -
             - pref: finesCalendar
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 67ef50a828..c7f0bd8111 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -907,7 +907,7 @@ OPAC:
         -
             - "The email address to receive PayPal payments is "
             - pref: PayPalUser
-              class: long
+              class: email
             - "."
         -
             - "The password for the PayPal account to receive payments is "
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index e599773fa2..ef3f6550ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -184,6 +184,7 @@ Patrons:
          - pref: SMSSendPassword
          - ". Override from address with"
          - pref: EmailSMSSendDriverFromAddress
+           class: email
          - "for emails sent using \"Email\" send driver."
      -
          - pref: FallbackToSMSIfNoEmail