diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html
index 91f3928475bbd6730ef557678690de923759f4af..60f4514a0c5d1f45570a58654b2995c66840f955 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html
@@ -1 +1,2 @@
-<button class="btn btn-default {className}" type="submit" name="install[set][{name}]">{text}</button>
\ No newline at end of file
+<button class="btn btn-default {className}" type="submit">{text}</button>
+<input type="hidden" name="install[set][{name}]" value="submit" />
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html
index d4d68825a65a98beb746231879814c7470ef47f9..aa0d9a5455f51179ab5b2bd4be0ae333d1d7efce 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html
@@ -22,4 +22,4 @@
 			</f:for>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
index 7b9d137192abc0d0f80321675da21fcac5bcefd9..864d266063ff93e23f4f5b2fa5b9a3eeb3aef79e 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
@@ -7,7 +7,7 @@
 				id="t3-install-tool-configuration-context-custom"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-context-custom"
@@ -16,7 +16,7 @@
 				<strong>
 					Custom configuration
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -27,10 +27,11 @@
 
 		<f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
 			<div class="form-group">
-				<label class="col-sm-4 control-label">{configurationKey}</label>
+				<label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
 				<div class="col-sm-8">
 					<input
-						type="input"
+						id="{feature.name}{preset.name}{configurationKey}"
+						type="text"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
 						class="form-control t3js-custom-preset"
@@ -41,4 +42,4 @@
 		</f:for>
 	</div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html
index de184ba9e707622b75aabe167fd248b68ab174fa..596fb9eff0a7ba5fd93679b8f43809f11391a282 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html
@@ -7,14 +7,14 @@
 				id="t3-install-tool-configuration-context-debug"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-context-debug"
 				class="t3-install-tool-configuration-radio-label"
 			>
 				<strong>Debug</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html
index e9ebcc9d1afeadf0f8f0bd8c9d9d0ae96eb9f249..53a0e046e9b5241728ce58d3c737891e80fb943b 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html
@@ -7,14 +7,14 @@
 				id="t3-install-tool-configuration-context-live"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-context-live"
 				class="t3-install-tool-configuration-radio-label"
 			>
 				<strong>Live</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html
index f4e80a66bb4320a373e244adc2014490b8ed4c74..c2ce156928807b4149e00c8614ad8d3646b0d9f6 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html
@@ -8,7 +8,7 @@
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-extbaseobjectcache-apc"
@@ -17,7 +17,7 @@
 				<strong>
 					APC cache backend
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apcu.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apcu.html
index 9557ab7e645eb7c61ef2952c62b5659a9d812958..c59e654a4a98f7200cdb474fcf274e2631ffa37d 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apcu.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apcu.html
@@ -8,7 +8,7 @@
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-extbaseobjectcache-apc"
@@ -17,7 +17,7 @@
 				<strong>
 					APCu cache backend
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html
index 5be8a2d8609c13f65ed21c001afa7ccf89460072..ed764522ee2313dff87c8ea519fceb9435b6f3d1 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html
@@ -7,7 +7,7 @@
 				id="t3-install-tool-configuration-extbaseobjectcache-database"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-extbaseobjectcache-database"
@@ -16,7 +16,7 @@
 				<strong>
 					Database cache backend
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -25,4 +25,4 @@
 		fallback if APC is not available.
 	</div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html
index b5db6c71ea97ef76ebfc159c7d9a74782ce6b5d2..8e40e0e5aa7150a0c4ad898e84106447f949d4c3 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html
@@ -28,7 +28,7 @@
 				<div class="col-sm-12">
 					<div class="input-group">
 						<input
-								type="input"
+								type="text"
 								name="install[values][{feature.name}][additionalSearchPath]"
 								value="{feature.additionalSearchPath}"
 								class="form-control"
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
index deda64cd5bd548346444bde13a886145216a2e46..0568b0357055df56c92fc52ceea57d0b519458ec 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
@@ -7,7 +7,7 @@
 				id="t3-install-tool-configuration-image-custom"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-image-custom"
@@ -16,7 +16,7 @@
 				<strong>
 					Custom configuration
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -27,10 +27,11 @@
 
 		<f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
 			<div class="form-group">
-				<label class="col-sm-4 control-label">{configurationKey}</label>
+				<label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
 				<div class="col-sm-8">
 					<input
-						type="input"
+						id="{feature.name}{preset.name}{configurationKey}"
+						type="text"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
 						class="form-control t3js-custom-preset"
@@ -41,4 +42,4 @@
 		</f:for>
 	</div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html
index f64f23568ab9ab914d484e0227227e255305b758..243f0e9519055200fea1a06679bdef850fe41a7d 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html
@@ -8,7 +8,7 @@
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-image-graphicsmagick"
@@ -17,7 +17,7 @@
 				<strong>
 					Graphics Magick
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -34,4 +34,4 @@
 		</f:if>
 	</div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html
index 15b80a0feda7838d45ce6b7f188a3bed0619b626..5062e83439ca459b9b051883891b6cc9b01210d6 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html
@@ -8,7 +8,7 @@
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-image-imagemagick6"
@@ -17,7 +17,7 @@
 				<strong>
 					Image Magick version 6 or higher
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -34,4 +34,4 @@
 		</f:if>
 	</div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
index 9531c8256289dee8bc3932bd193905c50cdd60d1..ce19ff34de9f9c9630ae285eb9b98b812bcf4f71 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
@@ -7,7 +7,7 @@
 				id="t3-install-tool-configuration-mail-custom"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-mail-custom"
@@ -16,7 +16,7 @@
 				<strong>
 					Custom configuration
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>
@@ -27,10 +27,11 @@
 
 		<f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
 			<div class="form-group">
-				<label class="col-sm-6 control-label">{configurationKey}</label>
+				<label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
 				<div class="col-sm-6">
 					<input
-						type="input"
+						id="{feature.name}{preset.name}{configurationKey}"
+						type="text"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
 						class="form-control t3js-custom-preset"
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html
index 9ea3c6ee6975612c77f2c38097a2ce5aa5241a02..8f7fa02909494e5984631e1e251186b05ad695b9 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html
@@ -8,7 +8,7 @@
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+				{f:if(condition: preset.isActive, then:'checked="checked"')}
 			/>
 			<label
 				for="t3-install-tool-configuration-mail-sendmail"
@@ -17,7 +17,7 @@
 				<strong>
 					Import sendmail command from PHP settings
 				</strong>
-				{f:if(condition:'{preset.isActive}', then:' [Active]')}
+				{f:if(condition: preset.isActive, then:' [Active]')}
 			</label>
 		</div>
 	</div>