diff --git a/lib/form/templates/element-advcheckbox-inline.mustache b/lib/form/templates/element-advcheckbox-inline.mustache
index 0584acc05d6..a47a25cc7dc 100644
--- a/lib/form/templates/element-advcheckbox-inline.mustache
+++ b/lib/form/templates/element-advcheckbox-inline.mustache
@@ -13,7 +13,6 @@
         value="{{element.selectedvalue}}"
     {{/element.selectedvalue}}
     {{#element.checked}}checked{{/element.checked}}
-    size="{{element.size}}"
     {{#error}}
         autofocus aria-describedby="{{element.iderror}}"
     {{/error}}
diff --git a/lib/form/templates/element-password-inline.mustache b/lib/form/templates/element-password-inline.mustache
index 59da069256e..f832dec7df9 100644
--- a/lib/form/templates/element-password-inline.mustache
+++ b/lib/form/templates/element-password-inline.mustache
@@ -41,7 +41,7 @@
                 name="{{element.name}}"
                 id="{{element.id}}"
                 value="{{element.value}}"
-                size="{{element.size}}"
+                {{#element.size}}size="{{element.size}}"{{/element.size}}
                 {{#error}}
                     autofocus aria-describedby="{{element.iderror}}"
                 {{/error}} {{{element.attributes}}}>
diff --git a/lib/form/templates/element-password.mustache b/lib/form/templates/element-password.mustache
index d6e80f8c2ab..9a7758d1081 100644
--- a/lib/form/templates/element-password.mustache
+++ b/lib/form/templates/element-password.mustache
@@ -41,7 +41,7 @@
                 name="{{element.name}}"
                 id="{{element.id}}"
                 value="{{element.value}}"
-                size="{{element.size}}"
+                {{#element.size}}size="{{element.size}}"{{/element.size}}
                 {{#error}}
                     autofocus aria-describedby="{{element.iderror}}"
                 {{/error}} {{{element.attributes}}}>
diff --git a/lib/form/templates/element-text-inline.mustache b/lib/form/templates/element-text-inline.mustache
index b6bb3e91481..81f7a5a6d5c 100644
--- a/lib/form/templates/element-text-inline.mustache
+++ b/lib/form/templates/element-text-inline.mustache
@@ -8,7 +8,7 @@
             readonly {{#element.hardfrozen}}disabled{{/element.hardfrozen}}
     {{/element.frozen}}
             value="{{element.value}}"
-            size="{{element.size}}"
+            {{#element.size}}size="{{element.size}}"{{/element.size}}
             {{#error}}
                 autofocus aria-describedby="{{element.iderror}}"
             {{/error}}
diff --git a/lib/form/templates/element-text.mustache b/lib/form/templates/element-text.mustache
index 087201a6085..7e972a336f3 100644
--- a/lib/form/templates/element-text.mustache
+++ b/lib/form/templates/element-text.mustache
@@ -8,7 +8,7 @@
         {{/element.frozen}}
                 id="{{element.id}}"
                 value="{{element.value}}"
-                size="{{element.size}}"
+                {{#element.size}}size="{{element.size}}"{{/element.size}}
                 {{#error}}
                     autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}
diff --git a/lib/form/templates/element-url.mustache b/lib/form/templates/element-url.mustache
index 5529d4a24ba..e161c8f8c2f 100644
--- a/lib/form/templates/element-url.mustache
+++ b/lib/form/templates/element-url.mustache
@@ -8,7 +8,7 @@
                 name="{{element.name}}"
                 id="{{element.id}}"
                 value="{{element.value}}"
-                size="{{element.size}}"
+                {{#element.size}}size="{{element.size}}"{{/element.size}}
                 {{#error}}
                     autofocus aria-describedby="{{element.iderror}}"
                 {{/error}}