diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php
index dc6e28acaa..ac118941db 100644
--- a/phpBB/phpbb/template/twig/extension/forms.php
+++ b/phpBB/phpbb/template/twig/extension/forms.php
@@ -118,7 +118,9 @@ class forms extends AbstractExtension
 		try
 		{
 			return $environment->render('macros/forms/input.twig', [
+				'CLASS'		=> (string) ($form_data['class'] ?? ''),
 				'ID'		=> (string) ($form_data['id'] ?? ''),
+				'DATA'		=> $form_data['data'] ?? [],
 				'TYPE'		=> (string) $form_data['type'],
 				'NAME'		=> (string) $form_data['name'],
 				'SIZE'		=> (int) ($form_data['size'] ?? 0),
@@ -127,9 +129,7 @@ class forms extends AbstractExtension
 				'MAX'		=> (int) ($form_data['max'] ?? 0),
 				'STEP'		=> (int) ($form_data['step'] ?? 0),
 				'CHECKED'	=> (bool) ($form_data['checked'] ?? false),
-				'CLASS'		=> (string) ($form_data['class'] ?? ''),
 				'VALUE'		=> (string) ($form_data['value']),
-				'DATA'		=> $form_data['data'] ?? [],
 			]);
 		}
 		catch (\Twig\Error\Error $e)
@@ -176,13 +176,13 @@ class forms extends AbstractExtension
 		try
 		{
 			return $environment->render('macros/forms/select.twig', [
-				'ID'			=> (string) ($form_data['id'] ?? ''),
 				'CLASS'			=> (string) ($form_data['class'] ?? ''),
+				'ID'			=> (string) ($form_data['id'] ?? ''),
+				'DATA'			=> $form_data['data'] ?? [],
 				'NAME'			=> (string) $form_data['name'],
 				'TOGGLEABLE'	=> (bool) ($form_data['toggleable'] ?? false),
 				'OPTIONS'		=> $form_data['options'] ?? [],
 				'GROUP_ONLY'	=> (bool) ($form_data['group_only'] ?? false),
-				'DATA'			=> $form_data['data'] ?? [],
 				'SIZE'			=> (int) ($form_data['size'] ?? 0),
 				'MULTIPLE'		=> (bool) ($form_data['multiple'] ?? false),
 			]);
@@ -206,7 +206,9 @@ class forms extends AbstractExtension
 		try
 		{
 			return $environment->render('macros/forms/textarea.twig', [
+				'CLASS'			=> (string) ($form_data['class'] ?? ''),
 				'ID'		=> (string) $form_data['id'],
+				'DATA'			=> $form_data['data'] ?? [],
 				'NAME'		=> (string) $form_data['name'],
 				'ROWS'		=> (int) $form_data['rows'],
 				'COLS'		=> (int) $form_data['cols'],
diff --git a/phpBB/styles/all/template/macros/forms/input.twig b/phpBB/styles/all/template/macros/forms/input.twig
index c902552ce7..1a2ff13fa3 100644
--- a/phpBB/styles/all/template/macros/forms/input.twig
+++ b/phpBB/styles/all/template/macros/forms/input.twig
@@ -1,6 +1,10 @@
 {% apply replace({"\n": ' ', "\t": ''}) %}
 	<input
+		{% if CLASS %}class="{{ CLASS }}" {% endif %}
 		{% if ID %}id="{{ ID }}" {% endif %}
+		{% for attribute, attribute_value in DATA %}
+			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
+		{% endfor %}
 		type="{{ TYPE }}"
 		name="{{ NAME }}"
 		{% if SIZE %}size="{{ SIZE }}" {% endif %}
@@ -10,9 +14,5 @@
 		{% if STEP %}step="{{ STEP }}" {% endif %}
 		{% if TYPE == 'password' %}autocomplete="off" {% endif %}
 		{% if CHECKED %}checked="checked" {% endif %}
-		{% if CLASS %}class="{{ CLASS }}" {% endif %}
-		{% for attribute, attribute_value in DATA %}
-			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
-		{% endfor %}
 		value="{{ VALUE }}">
 {% endapply %}
diff --git a/phpBB/styles/all/template/macros/forms/select.twig b/phpBB/styles/all/template/macros/forms/select.twig
index 70a13b97aa..3cab1e7199 100644
--- a/phpBB/styles/all/template/macros/forms/select.twig
+++ b/phpBB/styles/all/template/macros/forms/select.twig
@@ -1,12 +1,13 @@
 {% apply  replace({"\n": ' ', "\t": ''}) %}
 	<select
-		{% if ID %}id="{{ ID }}" {% endif %}
 		{% if CLASS %}class="{{ CLASS }}" {% endif %}
-		name="{{ NAME }}"
-		{% if TOGGLEABLE %}data-togglable-settings="true" {% endif %}
+		{% if ID %}id="{{ ID }}" {% endif %}
 		{% for attribute, attribute_value in DATA %}
 			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
 		{% endfor %}
+		name="{{ NAME }}"
+		{% if TOGGLEABLE %}data-togglable-settings="true" {% endif %}
+
 		{% if MULTIPLE %}multiple="multiple" {% endif %}
 		{% if SIZE %}size="{{ SIZE }}" {% endif %}>
 {% endapply %}
@@ -14,10 +15,10 @@
 	{% if not GROUP_ONLY and element.options %}
 		{% apply  replace({"\n": ' ', '\t': ''}) %}
 			<optgroup
-			label="{{ element.label }}"
 			{% for key, value in element.data %}
 				data-{{ key }}="{{ value }}"
-			{% endfor %}>
+			{% endfor %}
+			label="{{ element.label }}">
 		{% endapply %}
 		{% for option in element.options %}
 			<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}{% if option.disabled %} disabled="disabled" class="disabled-option"{% endif %}>{{ option.label }}</option>
diff --git a/phpBB/styles/all/template/macros/forms/textarea.twig b/phpBB/styles/all/template/macros/forms/textarea.twig
index 51a4c98ee6..e4fada13f2 100644
--- a/phpBB/styles/all/template/macros/forms/textarea.twig
+++ b/phpBB/styles/all/template/macros/forms/textarea.twig
@@ -1,9 +1,10 @@
 {% apply  replace({"\n": ' ', '\t': ''}) %}
 	<textarea
+		{% if CLASS %}class="{{ CLASS }}" {% endif %}
 		id="{{ ID }}"
+		{% for attribute, attribute_value in DATA %}
+			data-{{ attribute|e }}="{{ attribute_value|e('html_attr') }}"
+		{% endfor %}
 		name="{{ NAME }}"
 		rows="{{ ROWS }}"
-		cols="{{ COLS }}">
-			{{ CONTENT }}
-		</textarea>
-{% endapply %}
+		cols="{{ COLS }}">{% endapply %}{{ CONTENT }}</textarea>