diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 68a894f0b0..6142cd53a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -28,7 +28,7 @@
               [% search_options = default_fields.merge(pref_fields).unique %]
               [% FOREACH s_o IN search_options %]
                   [% display_name = PROCESS patron_fields name=s_o %]
-                  [% NEXT IF display_name.length == 5 %]
+                  [% NEXT IF !display_name.length %]
                   [% IF searchfieldstype == s_o %]
                       <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
                   [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 37c5f5fd46..209932b7a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -133,7 +133,7 @@
                             [% search_options = default_fields.merge(pref_fields).unique %]
                             [% FOREACH s_o IN search_options %]
                                 [% display_name = PROCESS patron_fields name=s_o %]
-                                [% NEXT IF display_name.length == 5 %]
+                                [% NEXT IF !display_name %]
                                 [% IF searchfieldstype == s_o %]
                                     <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
                                 [% ELSE %]