diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 214b29cf40..81a5d33da7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -99,7 +99,7 @@
 
                     [% SET mv = subfield.marc_value %]
                     [% IF ( mv.type == 'hidden' ) %]
-                        <input type="hidden" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
+                        <input type="hidden" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- subfield.maxlength | html -%]" value="[%- mv.value | html -%]" />
                     [% ELSIF ( mv.type == 'select' ) %]
                         [% SET select_readonly = '' %]
                         [% SET select_disabled = '' %]
@@ -152,12 +152,12 @@
                                 id="[%- mv.id | html -%]"
                                 name="[% kohafield | html %]"
                                 class="input_marceditor [% kohafield | html %]"
-                                maxlength="[%- mv.maxlength | html -%]"
+                                maxlength="[%- subfield.maxlength | html -%]"
                                 value="[%- mv.value | html -%]"
                                 readonly="readonly"
                             />
                         [% ELSE %]
-                            <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
+                            <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- subfield.maxlength | html -%]" value="[%- mv.value | html -%]" />
                             [% SET dopop = "Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=\"${mv.authtypecode}\"&index=${mv.id}','${mv.id}')" %]
                             <a href="#" class="buttonDot tag_editor" onclick="[%- dopop | html -%]; return false;" title="Tag editor">...</a>
                         [% END %]
@@ -168,7 +168,7 @@
                                 id="[%- mv.id | html -%]"
                                 name="[% kohafield | html %]"
                                 class="input_marceditor [% kohafield | html %]"
-                                maxlength="[%- mv.maxlength | html -%]"
+                                maxlength="[%- subfield.maxlength | html -%]"
                                 value="[%- mv.value | html -%]"
                                 readonly="readonly"
                             />
@@ -178,7 +178,7 @@
                                 id="[%- mv.id | html -%]"
                                 name="[% kohafield | html %]"
                                 class="input_marceditor framework_plugin [% kohafield | html %]"
-                                maxlength="[%- mv.maxlength | html -%]"
+                                maxlength="[%- subfield.maxlength | html -%]"
                                 value="[%- mv.value | html -%]"
                                 data-plugin="[% mv.plugin | html %]"
                             />
@@ -199,12 +199,12 @@
                                 id="[%- mv.id | html -%]"
                                 name="[% kohafield | html %]"
                                 class="input_marceditor [% kohafield | html %]"
-                                maxlength="[%- mv.maxlength | html -%]"
+                                maxlength="[%- subfield.maxlength | html -%]"
                                 value="[%- mv.value | html -%]"
                                 readonly="readonly"
                             />
                         [% ELSE %]
-                            <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]" />
+                            <input type="text" id="[%- mv.id | html -%]" name="[% kohafield | html %]" class="input_marceditor [% kohafield | html %]" maxlength="[%- subfield.maxlength | html -%]" value="[%- mv.value | html -%]" />
                         [% END %]
                     [% ELSIF ( mv.type == 'textarea' ) %]
                         [% IF mv.readonly %]