From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 24 Jun 2016 15:56:15 +0000 (+0200)
Subject: Removed XHTML relics
X-Git-Tag: 3.0.0_Beta_1~1356^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f2bc2353938408141073bed2a559abd48d47f79;p=GitHub%2FWoltLab%2FWCF.git

Removed XHTML relics
---

diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index 642c181709..eafe6c961b 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -67,19 +67,19 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="pollIsChangeable" value="1"{if $pollIsChangeable} checked="checked"{/if}> {lang}wcf.poll.isChangeable{/lang}</label>
+				<label><input type="checkbox" name="pollIsChangeable" value="1"{if $pollIsChangeable} checked{/if}> {lang}wcf.poll.isChangeable{/lang}</label>
 			</dd>
 			{if !$pollID && $__wcf->getPollManager()->canStartPublicPoll()}
 				<dd>
-					<label><input type="checkbox" name="pollIsPublic" value="1"{if $pollIsPublic} checked="checked"{/if}> {lang}wcf.poll.isPublic{/lang}</label>
+					<label><input type="checkbox" name="pollIsPublic" value="1"{if $pollIsPublic} checked{/if}> {lang}wcf.poll.isPublic{/lang}</label>
 				</dd>
 			{/if}
 			<dd>
-				<label><input type="checkbox" name="pollResultsRequireVote" value="1"{if $pollResultsRequireVote} checked="checked"{/if}> {lang}wcf.poll.resultsRequireVote{/lang}</label>
+				<label><input type="checkbox" name="pollResultsRequireVote" value="1"{if $pollResultsRequireVote} checked{/if}> {lang}wcf.poll.resultsRequireVote{/lang}</label>
 				<small>{lang}wcf.poll.resultsRequireVote.description{/lang}</small>
 			</dd>
 			<dd>
-				<label><input type="checkbox" name="pollSortByVotes" value="1"{if $pollSortByVotes} checked="checked"{/if}> {lang}wcf.poll.sortByVotes{/lang}</label>
+				<label><input type="checkbox" name="pollSortByVotes" value="1"{if $pollSortByVotes} checked{/if}> {lang}wcf.poll.sortByVotes{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl
index ae2ebe5bdc..3aa29e8bb5 100644
--- a/com.woltlab.wcf/templates/accountManagement.tpl
+++ b/com.woltlab.wcf/templates/accountManagement.tpl
@@ -24,7 +24,7 @@
 			<dl{if $errorField == 'password'} class="formError"{/if}>
 				<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 				<dd>
-					<input type="password" id="password" name="password" value="" required="required" class="medium">
+					<input type="password" id="password" name="password" value="" required class="medium">
 					{if $errorField == 'password'}
 						<small class="innerError">
 							{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -47,7 +47,7 @@
 			<dl{if $errorField == 'username'} class="formError"{/if}>
 				<dt><label for="username">{lang}wcf.user.newUsername{/lang}</label></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" required="required" pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium">
+					<input type="text" id="username" name="username" value="{$username}" required pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium">
 						
 					{if $errorField == 'username'}
 						<small class="innerError">
@@ -159,14 +159,14 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" name="cancelQuit" value="1"{if $cancelQuit == 1} checked="checked"{/if}> {lang}wcf.user.quit.cancel{/lang}</label>
+						<label><input type="checkbox" name="cancelQuit" value="1"{if $cancelQuit == 1} checked{/if}> {lang}wcf.user.quit.cancel{/lang}</label>
 					</dd>
 				</dl>
 			{else}
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" name="quit" value="1"{if $quit == 1} checked="checked"{/if}> {lang}wcf.user.quit.sure{/lang}</label>
+						<label><input type="checkbox" name="quit" value="1"{if $quit == 1} checked{/if}> {lang}wcf.user.quit.sure{/lang}</label>
 						<small>{lang}wcf.user.quit.description{/lang}</small>
 					</dd>
 				</dl>
@@ -194,7 +194,7 @@
 							<dt>{lang}wcf.user.3rdparty.github{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__githubToken')}
-									<label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
+									<label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked{/if}> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
 								{else}
 									<a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
 								{/if}
@@ -207,7 +207,7 @@
 							<dt>{lang}wcf.user.3rdparty.twitter{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__twitterData')}
-									<label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
+									<label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked{/if}> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
 								{else}
 									<a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
 								{/if}
@@ -220,7 +220,7 @@
 							<dt>{lang}wcf.user.3rdparty.facebook{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__facebookData')}
-									<label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
+									<label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked{/if}> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
 								{else}
 									<a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
 								{/if}
@@ -233,7 +233,7 @@
 							<dt>{lang}wcf.user.3rdparty.google{/lang}</dt>
 							<dd>
 								{if $__wcf->getSession()->getVar('__googleData')}
-									<label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked="checked"{/if}> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
+									<label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked{/if}> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
 								{else}
 									<a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
 								{/if}
diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index faaff97de9..3706998700 100644
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -17,7 +17,7 @@
 		<dl class="avatarType">
 			<dt></dt>
 			<dd>
-				<label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
+				<label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked {/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
 				<small>{lang}wcf.user.avatar.type.none.description{/lang}</small>
 			</dd>
 		</dl>
@@ -36,7 +36,7 @@
 					{/if}
 				</dt>
 				<dd>
-					<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked="checked"{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
+					<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
 					<small>{lang}wcf.user.avatar.type.custom.description{/lang}</small>
 					
 					{* placeholder for upload button: *}
@@ -55,7 +55,7 @@
 			<dl class="avatarType{if $errorField == 'gravatar'} formError{/if}">
 				<dt><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96"></dt>
 				<dd>
-					<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked="checked"{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
+					<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
 					{if $errorField == 'gravatar'}
 						<small class="innerError">
 							{if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if}
diff --git a/com.woltlab.wcf/templates/booleanOptionType.tpl b/com.woltlab.wcf/templates/booleanOptionType.tpl
index 754a9899c8..92fd14be1e 100644
--- a/com.woltlab.wcf/templates/booleanOptionType.tpl
+++ b/com.woltlab.wcf/templates/booleanOptionType.tpl
@@ -1,10 +1,10 @@
 <ol class="flexibleButtonGroup">
 	<li>
-		<input type="radio" id="{$option->optionName}"{if $value == 1} checked="checked"{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
-		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked="checked"{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/com.woltlab.wcf/templates/categoryOptionList.tpl b/com.woltlab.wcf/templates/categoryOptionList.tpl
index 0d0860db0e..addb9d8a08 100644
--- a/com.woltlab.wcf/templates/categoryOptionList.tpl
+++ b/com.woltlab.wcf/templates/categoryOptionList.tpl
@@ -1,5 +1,5 @@
 {foreach from=$categoryNodeList item='category'}
 	{if !$maximumNestingLevel|isset || $maximumNestingLevel == -1 || $categoryNodeList->getDepth() < $maximumNestingLevel}
-		<option value="{$category->categoryID}"{if $categoryID|isset && $categoryID == $category->categoryID} selected="selected"{/if}>{section name=i loop=$categoryNodeList->getDepth()}&nbsp;&nbsp;&nbsp;&nbsp;{/section}{$category->getTitle()}</option>
+		<option value="{$category->categoryID}"{if $categoryID|isset && $categoryID == $category->categoryID} selected{/if}>{section name=i loop=$categoryNodeList->getDepth()}&nbsp;&nbsp;&nbsp;&nbsp;{/section}{$category->getTitle()}</option>
 	{/if}
 {/foreach}
diff --git a/com.woltlab.wcf/templates/checkboxesOptionType.tpl b/com.woltlab.wcf/templates/checkboxesOptionType.tpl
index ade4955da1..cc90e693d0 100644
--- a/com.woltlab.wcf/templates/checkboxesOptionType.tpl
+++ b/com.woltlab.wcf/templates/checkboxesOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl b/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
index 59735a04ca..a76effacf2 100644
--- a/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/checkboxesSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked{/if}{if !$searchOption} disabled{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
index b817f97df3..a2da40c3d2 100644
--- a/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
+++ b/com.woltlab.wcf/templates/commentAddGuestDialog.tpl
@@ -3,7 +3,7 @@
 		<dl{if $errorType[username]|isset} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="long" autofocus="true">
+				<input type="text" id="username" name="username" value="{$username}" required class="long" autofocus="true">
 				{if $errorType[username]|isset}
 					<small class="innerError">
 						{if $errorType[username] == 'empty'}
diff --git a/com.woltlab.wcf/templates/editHistory.tpl b/com.woltlab.wcf/templates/editHistory.tpl
index 200b76a93e..28de2c27c5 100644
--- a/com.woltlab.wcf/templates/editHistory.tpl
+++ b/com.woltlab.wcf/templates/editHistory.tpl
@@ -76,7 +76,7 @@
 				<tr>
 					<td class="columnIcon">
 						<span class="icon icon16 fa-undo disabled"></span>
-						<input type="radio" name="oldID" value="current"{if $oldID === 'current'} checked="checked"{/if}> <input type="radio" name="newID" value="current"{if $newID === 'current'} checked="checked"{/if}>
+						<input type="radio" name="oldID" value="current"{if $oldID === 'current'} checked{/if}> <input type="radio" name="newID" value="current"{if $newID === 'current'} checked{/if}>
 						{event name='rowButtons'}
 					</td>
 					<td class="columnID"><strong>{lang}wcf.edit.currentVersion{/lang}</strong></td>
@@ -90,7 +90,7 @@
 					<tr class="jsEditRow">
 						<td class="columnIcon">
 							<span class="icon icon16 fa-undo pointer jsRevertButton jsTooltip" title="{lang}wcf.edit.revert{/lang}" data-object-id="{@$edit->entryID}" data-confirm-message="{lang __encode=true}wcf.edit.revert.sure{/lang}"></span>
-							<input type="radio" name="oldID" value="{@$edit->entryID}"{if $oldID == $edit->entryID} checked="checked"{/if}> <input type="radio" name="newID" value="{@$edit->entryID}"{if $newID == $edit->entryID} checked="checked"{/if}>
+							<input type="radio" name="oldID" value="{@$edit->entryID}"{if $oldID == $edit->entryID} checked{/if}> <input type="radio" name="newID" value="{@$edit->entryID}"{if $newID == $edit->entryID} checked{/if}>
 							{event name='rowButtons'}
 						</td>
 						<td class="columnID">{#($tpl[foreach][edit][total] - $tpl[foreach][edit][iteration] + 1)}</td>
diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl
index 2cec5fe803..b9aca1741a 100644
--- a/com.woltlab.wcf/templates/emailActivation.tpl
+++ b/com.woltlab.wcf/templates/emailActivation.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'u'} class="formError"{/if}>
 			<dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
 			<dd>
-				<input type="text" id="userID" name="u" value="{@$u}" required="required" class="medium">
+				<input type="text" id="userID" name="u" value="{@$u}" required class="medium">
 				{if $errorField == 'u'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if}
@@ -19,7 +19,7 @@
 		<dl{if $errorField == 'a'} class="formError"{/if}>
 			<dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required="required" class="medium">
+				<input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required class="medium">
 				{if $errorField == 'a'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
diff --git a/com.woltlab.wcf/templates/emailNewActivationCode.tpl b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
index f55bae05ae..c0bc50ebc3 100644
--- a/com.woltlab.wcf/templates/emailNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/emailNewActivationCode.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" required class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
+				<input type="password" id="password" name="password" value="{$password}" required class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/flexibleCategoryList.tpl b/com.woltlab.wcf/templates/flexibleCategoryList.tpl
index 57a944de9b..4d2fa860d8 100644
--- a/com.woltlab.wcf/templates/flexibleCategoryList.tpl
+++ b/com.woltlab.wcf/templates/flexibleCategoryList.tpl
@@ -6,20 +6,20 @@
 	{foreach from=$flexibleCategoryList item=categoryItem}
 		<li>
 			<div class="containerHeadline">
-				<h3><label{if $categoryItem->getDescription()} class="jsTooltip" title="{$categoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$categoryItem->categoryID}" class="jsCategory"{if $categoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$categoryItem->getTitle()}</label></h3>
+				<h3><label{if $categoryItem->getDescription()} class="jsTooltip" title="{$categoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$categoryItem->categoryID}" class="jsCategory"{if $categoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked{/if}> {$categoryItem->getTitle()}</label></h3>
 			</div>
 			
 			{if $categoryItem->hasChildren()}
 				<ol>
 					{foreach from=$categoryItem item=subCategoryItem}
 						<li>
-							<label{if $subCategoryItem->getDescription()} class="jsTooltip" title="{$subCategoryItem->getDescription()}"{/if} style="font-size: 1rem;"><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subCategoryItem->categoryID}" class="jsChildCategory"{if $subCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$subCategoryItem->getTitle()}</label>
+							<label{if $subCategoryItem->getDescription()} class="jsTooltip" title="{$subCategoryItem->getDescription()}"{/if} style="font-size: 1rem;"><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subCategoryItem->categoryID}" class="jsChildCategory"{if $subCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked{/if}> {$subCategoryItem->getTitle()}</label>
 							
 							{if $subCategoryItem->hasChildren()}
 								<ol>
 									{foreach from=$subCategoryItem item=subSubCategoryItem}
 										<li>
-											<label{if $subSubCategoryItem->getDescription()} class="jsTooltip" title="{$subSubCategoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subSubCategoryItem->categoryID}" class="jsSubChildCategory"{if $subSubCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked="checked"{/if}> {$subSubCategoryItem->getTitle()}</label>
+											<label{if $subSubCategoryItem->getDescription()} class="jsTooltip" title="{$subSubCategoryItem->getDescription()}"{/if}><input type="checkbox" name="{$flexibleCategoryListName}[]" value="{@$subSubCategoryItem->categoryID}" class="jsSubChildCategory"{if $subSubCategoryItem->categoryID|in_array:$flexibleCategoryListSelectedIDs} checked{/if}> {$subSubCategoryItem->getTitle()}</label>
 										</li>
 									{/foreach}
 								</ol>
diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index a518b58475..6c35e4133a 100644
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -14,7 +14,7 @@
 			<dl{if $errorField == 'username'} class="formError"{/if}>
 				<dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
 				<dd>
-					<input type="text" id="username" name="username" value="{$username}" required="required" class="long">
+					<input type="text" id="username" name="username" value="{$username}" required class="long">
 					{if $errorField == 'username'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl
index f0fe90c22d..7f691c2615 100644
--- a/com.woltlab.wcf/templates/mail.tpl
+++ b/com.woltlab.wcf/templates/mail.tpl
@@ -9,7 +9,7 @@
 		<dl{if $errorField == 'subject'} class="formError"{/if}>
 			<dt><label for="subject">{lang}wcf.user.mail.subject{/lang}</label></dt>
 			<dd>
-				<input type="text" id="subject" name="subject" value="{$subject}" required="required" class="long">
+				<input type="text" id="subject" name="subject" value="{$subject}" required class="long">
 				{if $errorField == 'subject'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,13 +25,13 @@
 		{if $__wcf->user->userID}
 			<dl>
 				<dt></dt>
-				<dd><label><input type="checkbox" name="showAddress" value="1"{if $showAddress == 1} checked="checked"{/if}> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
+				<dd><label><input type="checkbox" name="showAddress" value="1"{if $showAddress == 1} checked{/if}> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
 			</dl>
 		{else}
 			<dl{if $errorField == 'email'} class="formError"{/if}>
 				<dt><label for="email">{lang}wcf.user.mail.senderEmail{/lang}</label></dt>
 				<dd>
-					<input type="email" id="email" name="email" value="{$email}" required="required" class="medium">
+					<input type="email" id="email" name="email" value="{$email}" required class="medium">
 					{if $errorField == 'email'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -55,7 +55,7 @@
 		
 		<dl class="wide{if $errorField == 'message'} formError{/if}">
 			<dd>
-				<textarea rows="15" cols="40" name="message" id="message" required="required">{$message}</textarea>
+				<textarea rows="15" cols="40" name="message" id="message" required>{$message}</textarea>
 				{if $errorField == 'message'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/manageSubscription.tpl b/com.woltlab.wcf/templates/manageSubscription.tpl
index 10c3d8b3a5..d62f7bef1c 100644
--- a/com.woltlab.wcf/templates/manageSubscription.tpl
+++ b/com.woltlab.wcf/templates/manageSubscription.tpl
@@ -1,14 +1,14 @@
 <div class="section">
 	<dl class="wide">
 		<dd>
-			<label><input type="radio" name="subscribe" value="1"{if $userObjectWatch} checked="checked"{/if}> {lang}wcf.user.objectWatch.subscribe.{@$objectType->objectType}{/lang}</label>
+			<label><input type="radio" name="subscribe" value="1"{if $userObjectWatch} checked{/if}> {lang}wcf.user.objectWatch.subscribe.{@$objectType->objectType}{/lang}</label>
 			
-			<small><label><input type="checkbox" name="enableNotification" value="1"{if $userObjectWatch && $userObjectWatch->notification} checked="checked"{/if}> {lang}wcf.user.objectWatch.enableNotification.{@$objectType->objectType}{/lang}</label></small>
+			<small><label><input type="checkbox" name="enableNotification" value="1"{if $userObjectWatch && $userObjectWatch->notification} checked{/if}> {lang}wcf.user.objectWatch.enableNotification.{@$objectType->objectType}{/lang}</label></small>
 		</dd>
 	</dl>
 	<dl class="wide">
 		<dd>
-			<label><input type="radio" name="subscribe" value="0"{if !$userObjectWatch} checked="checked"{/if}> {lang}wcf.user.objectWatch.unsubscribe.{@$objectType->objectType}{/lang}</label>
+			<label><input type="radio" name="subscribe" value="0"{if !$userObjectWatch} checked{/if}> {lang}wcf.user.objectWatch.unsubscribe.{@$objectType->objectType}{/lang}</label>
 		</dd>
 	</dl>
 	
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 568b7a8e4e..341e47efd4 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -54,16 +54,16 @@
 					<dt></dt>
 					<dd>
 						<select id="sortField" name="sortField">
-							<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
-							<option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
-							<option value="activityPoints"{if $sortField == 'activityPoints'} selected="selected"{/if}>{lang}wcf.user.activityPoint{/lang}</option>
-							{if MODULE_LIKE}<option value="likesReceived"{if $sortField == 'likesReceived'} selected="selected"{/if}>{lang}wcf.like.likesReceived{/lang}</option>{/if}
-							<option value="lastActivityTime"{if $sortField == 'lastActivityTime'} selected="selected"{/if}>{lang}wcf.user.usersOnline.lastActivity{/lang}</option>
+							<option value="username"{if $sortField == 'username'} selected{/if}>{lang}wcf.user.username{/lang}</option>
+							<option value="registrationDate"{if $sortField == 'registrationDate'} selected{/if}>{lang}wcf.user.registrationDate{/lang}</option>
+							<option value="activityPoints"{if $sortField == 'activityPoints'} selected{/if}>{lang}wcf.user.activityPoint{/lang}</option>
+							{if MODULE_LIKE}<option value="likesReceived"{if $sortField == 'likesReceived'} selected{/if}>{lang}wcf.like.likesReceived{/lang}</option>{/if}
+							<option value="lastActivityTime"{if $sortField == 'lastActivityTime'} selected{/if}>{lang}wcf.user.usersOnline.lastActivity{/lang}</option>
 							{event name='sortField'}
 						</select>
 						<select name="sortOrder">
-							<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-							<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+							<option value="ASC"{if $sortOrder == 'ASC'} selected{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+							<option value="DESC"{if $sortOrder == 'DESC'} selected{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
 						</select>
 					</dd>
 				</dl>
diff --git a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
index 2f23e0d6a4..f5f422b76b 100644
--- a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
+++ b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
@@ -4,12 +4,12 @@
 		<dd>
 			<ul>
 				{if $assignedUser && $assignedUser->userID != $__wcf->getUser()->userID}
-					<li><label><input type="radio" name="assignedUserID" value="{@$assignedUser->userID}" checked="checked"> {$assignedUser->username}</label></li>
+					<li><label><input type="radio" name="assignedUserID" value="{@$assignedUser->userID}" checked> {$assignedUser->username}</label></li>
 				{/if}
-				<li><label><input type="radio" name="assignedUserID" value="{@$__wcf->getUser()->userID}"{if $assignedUser && $assignedUser->userID == $__wcf->getUser()->userID} checked="checked"{/if}> {$__wcf->getUser()->username}</label></li>
-				<li><label><input type="radio" name="assignedUserID" value="0"{if !$assignedUser} checked="checked"{/if}> {lang}wcf.moderation.assignedUser.nobody{/lang}</label></li>
+				<li><label><input type="radio" name="assignedUserID" value="{@$__wcf->getUser()->userID}"{if $assignedUser && $assignedUser->userID == $__wcf->getUser()->userID} checked{/if}> {$__wcf->getUser()->username}</label></li>
+				<li><label><input type="radio" name="assignedUserID" value="0"{if !$assignedUser} checked{/if}> {lang}wcf.moderation.assignedUser.nobody{/lang}</label></li>
 				<li>
-					<input type="radio" name="assignedUserID" value="-1"{if !$assignedUser} checked="checked"{/if}>
+					<input type="radio" name="assignedUserID" value="-1"{if !$assignedUser} checked{/if}>
 					<input type="text" id="assignedUsername" name="assignedUsername" value="{if $assignedUser}{$assignedUser->username}{/if}">
 					{*if $errorField == 'assignedUsername'}
 						<small class="innerError">
diff --git a/com.woltlab.wcf/templates/moderationReportDialog.tpl b/com.woltlab.wcf/templates/moderationReportDialog.tpl
index 54c99c0174..d36af6e875 100644
--- a/com.woltlab.wcf/templates/moderationReportDialog.tpl
+++ b/com.woltlab.wcf/templates/moderationReportDialog.tpl
@@ -6,7 +6,7 @@
 		
 		<dl class="wide">
 			<dd>
-				<textarea id="reason" required="required" cols="60" rows="10" class="jsReportMessage" maxlength="64000"></textarea>
+				<textarea id="reason" required cols="60" rows="10" class="jsReportMessage" maxlength="64000"></textarea>
 				<small>{lang}wcf.moderation.report.reason.description{/lang}</small>
 			</dd>
 		</dl>
diff --git a/com.woltlab.wcf/templates/multiSelectOptionType.tpl b/com.woltlab.wcf/templates/multiSelectOptionType.tpl
index 3c8ce8570d..d38909b56d 100644
--- a/com.woltlab.wcf/templates/multiSelectOptionType.tpl
+++ b/com.woltlab.wcf/templates/multiSelectOptionType.tpl
@@ -1,5 +1,5 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
 {foreach from=$selectOptions key=key item=selectOption}
-	<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	<option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 {/foreach}
 </select>
diff --git a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
index 84bb0cfb60..a0de775922 100644
--- a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
@@ -1,7 +1,7 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled{/if}>
 	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		<option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
 </select>
 
diff --git a/com.woltlab.wcf/templates/newPassword.tpl b/com.woltlab.wcf/templates/newPassword.tpl
index 57a8a25395..537d398543 100644
--- a/com.woltlab.wcf/templates/newPassword.tpl
+++ b/com.woltlab.wcf/templates/newPassword.tpl
@@ -9,7 +9,7 @@
 				<label for="userID">{lang}wcf.user.userID{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium">
+				<input type="text" id="userID" name="u" value="{@$userID}" required class="medium">
 				{if $errorField == 'userID'}
 					<small class="innerError">
 						{lang}wcf.user.userID.error.{$errorType}{/lang}
@@ -23,7 +23,7 @@
 				<label for="lostPasswordKey">{lang}wcf.user.lostPasswordKey{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium">
+				<input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required class="medium">
 				{if $errorField == 'lostPasswordKey'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index f41d31d42f..a6b475f82a 100644
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -26,14 +26,14 @@
 						<dd>
 							<ol class="flexibleButtonGroup" data-object-id="{@$event->eventID}">
 								<li>
-									<input type="radio" id="settings_{@$event->eventID}_disabled" name="settings[{@$event->eventID}][enabled]" value="0"{if $settings[$event->eventID][enabled]|empty} checked="checked"{/if}>
+									<input type="radio" id="settings_{@$event->eventID}_disabled" name="settings[{@$event->eventID}][enabled]" value="0"{if $settings[$event->eventID][enabled]|empty} checked{/if}>
 									<label for="settings_{@$event->eventID}_disabled" class="red">
 										<span class="icon icon16 fa-times"></span>
 										{lang}wcf.user.notification.notifications.disabled{/lang}
 									</label>
 								</li>
 								<li class="spaceAfter">
-									<input type="radio" id="settings_{@$event->eventID}_enabled" name="settings[{@$event->eventID}][enabled]" value="1"{if !$settings[$event->eventID][enabled]|empty} checked="checked"{/if}>
+									<input type="radio" id="settings_{@$event->eventID}_enabled" name="settings[{@$event->eventID}][enabled]" value="1"{if !$settings[$event->eventID][enabled]|empty} checked{/if}>
 									<label for="settings_{@$event->eventID}_enabled" class="green">
 										<span class="icon icon16 fa-bell"></span>
 										{lang}wcf.user.notification.notifications.enabled{/lang}
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 94f280dcbc..21842694fe 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -149,7 +149,7 @@
 								<dl>
 									<dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
 									<dd>
-										<input type="text" id="username" name="username" value="" required="required" class="long jsDialogAutoFocus">
+										<input type="text" id="username" name="username" value="" required class="long jsDialogAutoFocus">
 									</dd>
 								</dl>
 								
diff --git a/com.woltlab.wcf/templates/pollVote.tpl b/com.woltlab.wcf/templates/pollVote.tpl
index 876a8d03ef..804431ceba 100644
--- a/com.woltlab.wcf/templates/pollVote.tpl
+++ b/com.woltlab.wcf/templates/pollVote.tpl
@@ -3,7 +3,7 @@
 		<dt></dt>
 		<dd>
 			<label>
-				{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{@$poll->pollID}[]" value="{$option->optionValue}" data-option-id="{@$option->optionID}"{if $option->voted} checked="checked"{/if}>{/if}
+				{if $poll->canVote()}<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" name="pollOptions{@$poll->pollID}[]" value="{$option->optionValue}" data-option-id="{@$option->optionID}"{if $option->voted} checked{/if}>{/if}
 				{$option->optionValue}
 			</label>
 		</dd>
diff --git a/com.woltlab.wcf/templates/radioButtonOptionType.tpl b/com.woltlab.wcf/templates/radioButtonOptionType.tpl
index b868e71460..87e2e637ae 100644
--- a/com.woltlab.wcf/templates/radioButtonOptionType.tpl
+++ b/com.woltlab.wcf/templates/radioButtonOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach name=radioButtons from=$selectOptions key=key item=selectOption}
-	<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input {if $tpl.foreach.radioButtons.first}id="{$option->optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
index 4391f287cd..cd4c9d1ed9 100644
--- a/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 4e64711598..d491a68075 100644
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -21,7 +21,7 @@
 				<label for="{@$randomFieldNames[username]}">{lang}wcf.user.username{/lang}</label>
 			</dt>
 			<dd>
-				<input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required="required" class="medium">
+				<input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required class="medium">
 				{if $errorType.username|isset}
 					<small class="innerError">
 						{if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -71,7 +71,7 @@
 				<label for="{@$randomFieldNames[email]}">{lang}wcf.user.email{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required="required" class="medium">
+				<input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required class="medium">
 				{if $errorType.email|isset}
 					<small class="innerError">
 						{if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -87,7 +87,7 @@
 				<label for="{@$randomFieldNames[confirmEmail]}">{lang}wcf.user.confirmEmail{/lang}</label>
 			</dt>
 			<dd>
-				<input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required="required" class="medium">
+				<input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required class="medium">
 				{if $errorType.confirmEmail|isset}
 					<small class="innerError">
 						{if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
@@ -108,7 +108,7 @@
 					<label for="{@$randomFieldNames[password]}">{lang}wcf.user.password{/lang}</label>
 				</dt>
 				<dd>
-					<input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required="required" class="medium">
+					<input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required class="medium">
 					{if $errorType.password|isset}
 						<small class="innerError">
 							{if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
@@ -124,7 +124,7 @@
 					<label for="{@$randomFieldNames[confirmPassword]}">{lang}wcf.user.confirmPassword{/lang}</label>
 				</dt>
 				<dd>
-					<input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required="required" class="medium">
+					<input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required class="medium">
 					{if $errorType.confirmPassword|isset}
 						<small class="innerError">
 							{if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
@@ -146,7 +146,7 @@
 				<dd>
 					<select id="languageID" name="languageID">
 						{foreach from=$availableLanguages item=language}
-							<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
+							<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected{/if}>{$language}</option>
 						{/foreach}
 					</select>
 					<small>{lang}wcf.user.language.description{/lang}</small>
@@ -159,7 +159,7 @@
 					<dd class="floated">
 					{content}
 						{foreach from=$availableContentLanguages item=language}
-							<label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked="checked"{/if}> {$language}</label>
+							<label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked{/if}> {$language}</label>
 						{/foreach}
 					{/content}
 					<small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl
index 6d477448db..31786b310e 100644
--- a/com.woltlab.wcf/templates/registerActivation.tpl
+++ b/com.woltlab.wcf/templates/registerActivation.tpl
@@ -9,7 +9,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" required class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
@@ -21,7 +21,7 @@
 		<dl{if $errorField == 'activationCode'} class="formError"{/if}>
 			<dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required="required" class="medium">
+				<input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required class="medium">
 				{if $errorField == 'activationCode'}
 					<small class="innerError">
 						{if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
index bf936901c6..af4e32f9e6 100644
--- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl
+++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl
@@ -7,7 +7,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" required class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
+				<input type="password" id="password" name="password" value="{$password}" required class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 01c1e8ede8..03a0bc8461 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -11,7 +11,7 @@
 		<dl{if $errorField == 'q'} class="formError"{/if}>
 			<dt><label for="searchTerm">{lang}wcf.search.query{/lang}</label></dt>
 			<dd>
-				<input type="text" id="searchTerm" name="q" value="{$query}" class="long" maxlength="255" autofocus="autofocus">
+				<input type="text" id="searchTerm" name="q" value="{$query}" class="long" maxlength="255" autofocus>
 				{if $errorField == 'q'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -21,7 +21,7 @@
 						{/if}
 					</small>
 				{/if}
-				<label><input type="checkbox" name="subjectOnly" value="1"{if $subjectOnly == 1} checked="checked"{/if}> {lang}wcf.search.subjectOnly{/lang}</label>
+				<label><input type="checkbox" name="subjectOnly" value="1"{if $subjectOnly == 1} checked{/if}> {lang}wcf.search.subjectOnly{/lang}</label>
 				{event name='queryOptions'}
 				
 				<small>{lang}wcf.search.query.description{/lang}</small>
@@ -32,7 +32,7 @@
 			<dt><label for="searchAuthor">{lang}wcf.search.author{/lang}</label></dt>
 			<dd>
 				<input type="text" id="searchAuthor" name="username" value="{$username}" class="long" maxlength="255" autocomplete="off">
-				<label><input type="checkbox" name="nameExactly" value="1"{if $nameExactly == 1} checked="checked"{/if}> {lang}wcf.search.matchExactly{/lang}</label>
+				<label><input type="checkbox" name="nameExactly" value="1"{if $nameExactly == 1} checked{/if}> {lang}wcf.search.matchExactly{/lang}</label>
 				{event name='authorOptions'}
 			</dd>
 		</dl>
@@ -51,17 +51,17 @@
 			<dd>
 				<label class="selectDropdown">
 					<select id="sortField" name="sortField">
-						<option value="relevance"{if $sortField == 'relevance'} selected="selected"{/if}>{lang}wcf.search.sortBy.relevance{/lang}</option>
-						<option value="subject"{if $sortField == 'subject'} selected="selected"{/if}>{lang}wcf.global.subject{/lang}</option>
-						<option value="time"{if $sortField == 'time'} selected="selected"{/if}>{lang}wcf.search.sortBy.time{/lang}</option>
-						<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.search.sortBy.username{/lang}</option>
+						<option value="relevance"{if $sortField == 'relevance'} selected{/if}>{lang}wcf.search.sortBy.relevance{/lang}</option>
+						<option value="subject"{if $sortField == 'subject'} selected{/if}>{lang}wcf.global.subject{/lang}</option>
+						<option value="time"{if $sortField == 'time'} selected{/if}>{lang}wcf.search.sortBy.time{/lang}</option>
+						<option value="username"{if $sortField == 'username'} selected{/if}>{lang}wcf.search.sortBy.username{/lang}</option>
 					</select>
 				</label>
 				
 				<label class="selectDropdown">
 					<select name="sortOrder">
-						<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-						<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+						<option value="ASC"{if $sortOrder == 'ASC'} selected{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+						<option value="DESC"{if $sortOrder == 'DESC'} selected{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
 					</select>
 				</label>
 				{event name='displayOptions'}
@@ -75,7 +75,7 @@
 			<dd class="floated">
 				{foreach from=$objectTypes key=objectTypeName item=objectType}
 					{if $objectType->isAccessible()}
-						<label><input id="{@'.'|str_replace:'_':$objectTypeName}" type="checkbox" name="types[]" value="{@$objectTypeName}"{if $objectTypeName|in_array:$selectedObjectTypes} checked="checked"{/if}> {lang}wcf.search.type.{@$objectTypeName}{/lang}</label>
+						<label><input id="{@'.'|str_replace:'_':$objectTypeName}" type="checkbox" name="types[]" value="{@$objectTypeName}"{if $objectTypeName|in_array:$selectedObjectTypes} checked{/if}> {lang}wcf.search.type.{@$objectTypeName}{/lang}</label>
 					{/if}
 				{/foreach}
 			</dd>
diff --git a/com.woltlab.wcf/templates/searchArticle.tpl b/com.woltlab.wcf/templates/searchArticle.tpl
index bf559210b1..6c6a5615b6 100644
--- a/com.woltlab.wcf/templates/searchArticle.tpl
+++ b/com.woltlab.wcf/templates/searchArticle.tpl
@@ -4,7 +4,7 @@
 		<ul class="scrollableCheckboxList">
 			{foreach from=$articleCategoryList item=category}
 				<li{if $category->getDepth() > 1} style="padding-left: {$category->getDepth()*20-20}px"{/if}>
-					<label><input type="checkbox" name="articleCategoryIDs[]" value="{@$category->categoryID}"{if $category->categoryID|in_array:$articleCategoryIDs} checked="checked"{/if}> {$category->getTitle()}</label>
+					<label><input type="checkbox" name="articleCategoryIDs[]" value="{@$category->categoryID}"{if $category->categoryID|in_array:$articleCategoryIDs} checked{/if}> {$category->getTitle()}</label>
 				</li>
 			{/foreach}
 		</ul>
diff --git a/com.woltlab.wcf/templates/selectOptionType.tpl b/com.woltlab.wcf/templates/selectOptionType.tpl
index ea30b398aa..40bc997f00 100644
--- a/com.woltlab.wcf/templates/selectOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectOptionType.tpl
@@ -2,7 +2,7 @@
 	<select id="{$option->optionName}" name="values[{$option->optionName}]">
 		{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
 		{foreach from=$selectOptions key=key item=selectOption}
-			<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+			<option value="{$key}"{if $value == $key} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 		{/foreach}
 	</select>
 </label>
diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
index 07a0a5560f..1aade96a44 100644
--- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
@@ -1,9 +1,9 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 <label class="selectDropdown">
-	<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
+	<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if}>
 		{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
 		{foreach from=$selectOptions key=key item=selectOption}
-			<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+			<option value="{$key}"{if $value == $key} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 		{/foreach}
 	</select>
 </label>
diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index 4e53a81ad3..55a9137b2c 100644
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -40,7 +40,7 @@
 						<noscript>
 							<select name="languageID" id="languageID">
 								{foreach from=$availableLanguages item=language}
-									<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
+									<option value="{@$language->languageID}"{if $language->languageID == $languageID} selected{/if}>{$language}</option>
 								{/foreach}
 							</select>
 						</noscript>
@@ -53,7 +53,7 @@
 						<dd class="floated">
 						{content}
 							{foreach from=$availableContentLanguages item=language}
-								<label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked="checked"{/if}> {$language}</label>
+								<label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked{/if}> {$language}</label>
 							{/foreach}
 						{/content}
 						<small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
@@ -74,7 +74,7 @@
 						<select id="styleID" name="styleID">
 							<option value="0">{lang}wcf.global.defaultValue{/lang}</option>
 							{foreach from=$availableStyles item=style}
-								<option value="{@$style->styleID}"{if $style->styleID == $styleID} selected="selected"{/if}>{$style->styleName}</option>
+								<option value="{@$style->styleID}"{if $style->styleID == $styleID} selected{/if}>{$style->styleName}</option>
 							{/foreach}
 						</select>
 						<small>{lang}wcf.user.style.description{/lang}</small>
diff --git a/com.woltlab.wcf/templates/textOptionType.tpl b/com.woltlab.wcf/templates/textOptionType.tpl
index a7b643097b..eb75d8830e 100644
--- a/com.woltlab.wcf/templates/textOptionType.tpl
+++ b/com.woltlab.wcf/templates/textOptionType.tpl
@@ -1 +1 @@
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0} required="required"{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $option->minlength > 0} required{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}>
diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
index b16f8c98d4..81c0de79b4 100644
--- a/com.woltlab.wcf/templates/textSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if}>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled{/if}>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
index 33d4a793e2..8c9f10a4e1 100644
--- a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if} cols="40" rows="10">{$value}</textarea>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if} cols="40" rows="10">{$value}</textarea>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index e183415a80..9d420a76f4 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -18,18 +18,18 @@
 					<dt></dt>
 					<dd>
 						<select id="sortField" name="sortField">
-							<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
-							<option value="lastActivityTime"{if $sortField == 'lastActivityTime'} selected="selected"{/if}>{lang}wcf.user.usersOnline.lastActivity{/lang}</option>
-							<option value="requestURI"{if $sortField == 'requestURI'} selected="selected"{/if}>{lang}wcf.user.usersOnline.location{/lang}</option>
+							<option value="username"{if $sortField == 'username'} selected{/if}>{lang}wcf.user.username{/lang}</option>
+							<option value="lastActivityTime"{if $sortField == 'lastActivityTime'} selected{/if}>{lang}wcf.user.usersOnline.lastActivity{/lang}</option>
+							<option value="requestURI"{if $sortField == 'requestURI'} selected{/if}>{lang}wcf.user.usersOnline.location{/lang}</option>
 							
 							{if $__wcf->session->getPermission('admin.user.canViewIpAddress')}
-								<option value="ipAddress"{if $sortField == 'ipAddress'} selected="selected"{/if}>{lang}wcf.user.usersOnline.ipAddress{/lang}</option>
-								<option value="userAgent"{if $sortField == 'userAgent'} selected="selected"{/if}>{lang}wcf.user.usersOnline.userAgent{/lang}</option>
+								<option value="ipAddress"{if $sortField == 'ipAddress'} selected{/if}>{lang}wcf.user.usersOnline.ipAddress{/lang}</option>
+								<option value="userAgent"{if $sortField == 'userAgent'} selected{/if}>{lang}wcf.user.usersOnline.userAgent{/lang}</option>
 							{/if}
 						</select>
 						<select name="sortOrder">
-							<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-							<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+							<option value="ASC"{if $sortOrder == 'ASC'} selected{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+							<option value="DESC"{if $sortOrder == 'DESC'} selected{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
 						</select>
 					</dd>
 				</dl>
diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 00dc7a2167..e1b2c72463 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -2076,7 +2076,7 @@ WCF.ACP.User.BanHandler = {
 		if (this._dialog === null) {
 			// create dialog
 			this._dialog = $('<div />').hide().appendTo(document.body);
-			this._dialog.append($('<div class="section"><dl><dt><label for="userBanReason">' + WCF.Language.get('wcf.acp.user.banReason') + '</label></dt><dd><textarea id="userBanReason" cols="40" rows="3" /><small>' + WCF.Language.get('wcf.acp.user.banReason.description') + '</small></dd></dl><dl><dt></dt><dd><label for="userBanNeverExpires"><input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.acp.user.ban.neverExpires') + '</label></dd></dl><dl id="userBanExpiresSettings" style="display: none;"><dt><label for="userBanExpires">' + WCF.Language.get('wcf.acp.user.ban.expires') + '</label></dt><dd><input type="date" name="userBanExpires" id="userBanExpires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.acp.user.ban.expires.description') + '</small></dd></dl></div>'));
+			this._dialog.append($('<div class="section"><dl><dt><label for="userBanReason">' + WCF.Language.get('wcf.acp.user.banReason') + '</label></dt><dd><textarea id="userBanReason" cols="40" rows="3" /><small>' + WCF.Language.get('wcf.acp.user.banReason.description') + '</small></dd></dl><dl><dt></dt><dd><label for="userBanNeverExpires"><input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked> ' + WCF.Language.get('wcf.acp.user.ban.neverExpires') + '</label></dd></dl><dl id="userBanExpiresSettings" style="display: none;"><dt><label for="userBanExpires">' + WCF.Language.get('wcf.acp.user.ban.expires') + '</label></dt><dd><input type="date" name="userBanExpires" id="userBanExpires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.acp.user.ban.expires.description') + '</small></dd></dl></div>'));
 			this._dialog.append($('<div class="formSubmit"><button class="buttonPrimary" accesskey="s">' + WCF.Language.get('wcf.global.button.submit') + '</button></div>'));
 			
 			this._dialog.find('#userBanNeverExpires').change(function() {
diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index ffba830938..72fca849ed 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -35,7 +35,7 @@
 		<dl{if $errorField == 'adName'} class="formError"{/if}>
 			<dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="adName" name="adName" value="{$adName}" required autofocus class="long">
 				{if $errorField == 'adName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -68,7 +68,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.ad.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.ad.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -76,11 +76,11 @@
 			<dt><label for="objectTypeID">{lang}wcf.acp.ad.location{/lang}</label></dt>
 			<dd>
 				<select name="objectTypeID" id="objectTypeID">
-					<option value="0"{if !$objectTypeID} checked="checked"{/if}>{lang}wcf.global.noSelection{/lang}</option>
+					<option value="0"{if !$objectTypeID} checked{/if}>{lang}wcf.global.noSelection{/lang}</option>
 					{foreach from=$locations key='locationGroupLabel' item='locationGroup'}
 						<optgroup label="{$locationGroupLabel}">
 							{foreach from=$locationGroup key='locationID' item='location'}
-								<option value="{@$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected="selected"{/if}>{$location}</option>
+								<option value="{@$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected{/if}>{$location}</option>
 							{/foreach}
 						</optgroup>
 					{/foreach}
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index 003bf0b319..1789658a3e 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -69,7 +69,7 @@
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
 					{foreach from=$categoryNodeList item=category}
-						<option value="{@$category->categoryID}"{if $category->categoryID == $categoryID} selected="selected"{/if}>{if $category->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
+						<option value="{@$category->categoryID}"{if $category->categoryID == $categoryID} selected{/if}>{if $category->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
 					{/foreach}
 				</select>
 				{if $errorField == 'categoryID'}
@@ -119,9 +119,9 @@
 		<dl>
 			<dt><label for="categoryID">{lang}wcf.acp.article.publicationStatus{/lang}</label></dt>
 			<dd>
-				<label><input type="radio" name="publicationStatus" value="0"{if $publicationStatus == 0} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.unpublished{/lang}</label>
-				<label><input type="radio" name="publicationStatus" value="1"{if $publicationStatus == 1} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.published{/lang}</label>
-				<label><input type="radio" name="publicationStatus" value="2"{if $publicationStatus == 2} checked="checked"{/if}> {lang}wcf.acp.article.publicationStatus.delayed{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="0"{if $publicationStatus == 0} checked{/if}> {lang}wcf.acp.article.publicationStatus.unpublished{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="1"{if $publicationStatus == 1} checked{/if}> {lang}wcf.acp.article.publicationStatus.published{/lang}</label>
+				<label><input type="radio" name="publicationStatus" value="2"{if $publicationStatus == 2} checked{/if}> {lang}wcf.acp.article.publicationStatus.delayed{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -144,7 +144,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input name="enableComments" type="checkbox" value="1"{if $enableComments} checked="checked"{/if}> {lang}wcf.acp.article.enableComments{/lang}</label>
+				<label><input name="enableComments" type="checkbox" value="1"{if $enableComments} checked{/if}> {lang}wcf.acp.article.enableComments{/lang}</label>
 			</dd>
 		</dl>
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index bc1248e35f..16f29efab8 100644
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -41,7 +41,7 @@
 						<option value="0">{lang}wcf.acp.article.category{/lang}</option>
 						
 						{foreach from=$categoryNodeList item=category}
-							<option value="{@$category->categoryID}"{if $category->categoryID == $categoryID} selected="selected"{/if}>{if $category->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
+							<option value="{@$category->categoryID}"{if $category->categoryID == $categoryID} selected{/if}>{if $category->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($category->getDepth() - 1)}{/if}{$category->getTitle()}</option>
 						{/foreach}
 					</select>
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
index 42a30590a5..1645317f1b 100644
--- a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$bbCodes item='bbCode'}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$bbCode}" {if $bbCode|in_array:$selectedBBCodes}checked="checked" {/if}> {$bbCode}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$bbCode}" {if $bbCode|in_array:$selectedBBCodes}checked {/if}> {$bbCode}</label>
 {/foreach}
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 3458bf2159..3ad8774c20 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -101,7 +101,7 @@
 		<dl{if $errorField == 'bbcodeTag'} class="formError"{/if}>
 			<dt><label for="bbcodeTag">{lang}wcf.acp.bbcode.bbcodeTag{/lang}</label></dt>
 			<dd>
-				<input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required="required" autofocus="autofocus" pattern="^[a-zA-Z0-9]+$" class="medium">
+				<input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required autofocus pattern="^[a-zA-Z0-9]+$" class="medium">
 				{if $errorField == 'bbcodeTag'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -145,7 +145,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked="checked"{/if}> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
+				<label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked{/if}> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
 				<small>{lang}wcf.acp.bbcode.isSourceCode.description{/lang}</small>
 			</dd>
 		</dl>
@@ -164,7 +164,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked="checked"{/if}> {lang}wcf.acp.bbcode.showButton{/lang}</label>
+					<label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked{/if}> {lang}wcf.acp.bbcode.showButton{/lang}</label>
 				</dd>
 			</dl>
 			
@@ -239,13 +239,13 @@
 				
 				<dl{if $errorField == 'attributeRequired'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dd>
-						<label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked="checked"{/if}> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
+						<label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked{/if}> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
 					</dd>
 				</dl>
 				
 				<dl{if $errorField == 'attributeUseText'|concat:$attribute->attributeNo} class="formError"{/if}>
 					<dd>
-						<label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked="checked"{/if}> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
+						<label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked{/if}> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
 						<small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
 					</dd>
 				</dl>
diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
index 05fdde8b2a..cd40ed03ab 100644
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.acp.bbcode.mediaProvider.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$title}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="title" name="title" value="{$title}" required autofocus class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -41,7 +41,7 @@
 		<dl{if $errorField == 'regex'} class="formError"{/if}>
 			<dt><label for="regex">{lang}wcf.acp.bbcode.mediaProvider.regex{/lang}</label></dt>
 			<dd>
-				<textarea id="regex" name="regex" cols="40" rows="10" required="required">{$regex}</textarea>
+				<textarea id="regex" name="regex" cols="40" rows="10" required>{$regex}</textarea>
 				{if $errorField == 'regex'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -58,7 +58,7 @@
 		<dl{if $errorField == 'html'} class="formError"{/if}>
 			<dt><label for="html">{lang}wcf.acp.bbcode.mediaProvider.html{/lang}</label></dt>
 			<dd>
-				<textarea id="html" name="html" cols="40" rows="10" required="required">{$html}</textarea>
+				<textarea id="html" name="html" cols="40" rows="10" required>{$html}</textarea>
 				{if $errorField == 'html'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
index 754a9899c8..92fd14be1e 100644
--- a/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/booleanOptionType.tpl
@@ -1,10 +1,10 @@
 <ol class="flexibleButtonGroup">
 	<li>
-		<input type="radio" id="{$option->optionName}"{if $value == 1} checked="checked"{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
-		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked="checked"{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 </ol>
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index c8c8fc28d6..88081b0d7d 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -72,7 +72,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
+						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -88,9 +88,9 @@
 				<dl{if $errorField == 'boxType'} class="formError"{/if}>
 					<dt><label for="boxType">{lang}wcf.acp.box.boxType{/lang}</label></dt>
 					<dd>
-						<select name="boxType" id="boxType" readonly="readonly">
+						<select name="boxType" id="boxType" readonly>
 							{foreach from=$availableBoxTypes item=availableBoxType}
-								<option value="{@$availableBoxType}"{if $availableBoxType == $boxType} selected="selected"{/if}>{lang}wcf.acp.box.boxType.{@$availableBoxType}{/lang}</option>
+								<option value="{@$availableBoxType}"{if $availableBoxType == $boxType} selected{/if}>{lang}wcf.acp.box.boxType.{@$availableBoxType}{/lang}</option>
 							{/foreach}
 						</select>
 						
@@ -111,7 +111,7 @@
 					<dd>
 						<select name="boxControllerID" id="boxControllerID">
 							{foreach from=$availableBoxControllers item=availableBoxController}
-								<option value="{@$availableBoxController->objectTypeID}"{if $boxController && $availableBoxController->objectTypeID == $boxController->objectTypeID} selected="selected"{/if}>{lang}wcf.acp.box.boxController.{@$availableBoxController->objectType}{/lang}</option>
+								<option value="{@$availableBoxController->objectTypeID}"{if $boxController && $availableBoxController->objectTypeID == $boxController->objectTypeID} selected{/if}>{lang}wcf.acp.box.boxController.{@$availableBoxController->objectType}{/lang}</option>
 							{/foreach}
 						</select>
 						
@@ -132,7 +132,7 @@
 					<dd>
 						<select name="position" id="position">
 							{foreach from=$availablePositions item=availablePosition}
-								<option value="{@$availablePosition}"{if $availablePosition == $position} selected="selected"{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
+								<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
 							{/foreach}
 						</select>
 						
@@ -174,7 +174,7 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked="checked"{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
+						<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
 					</dd>
 				</dl>
 			</div>
@@ -185,9 +185,9 @@
 				<dl>
 					<dt></dt>
 					<dd class="floated">
-						<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.none{/lang}</label>
-						<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.internal{/lang}</label>
-						<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked="checked"{/if}> {lang}wcf.acp.box.linkType.external{/lang}</label>
+						<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked{/if}> {lang}wcf.acp.box.linkType.none{/lang}</label>
+						<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked{/if}> {lang}wcf.acp.box.linkType.internal{/lang}</label>
+						<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked{/if}> {lang}wcf.acp.box.linkType.external{/lang}</label>
 					</dd>
 				</dl>
 				
@@ -198,7 +198,7 @@
 							<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 							
 							{foreach from=$pageNodeList item=pageNode}
-								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $linkPageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $linkPageID} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
 							{/foreach}
 						</select>
 						{if $errorField == 'linkPageID'}
@@ -404,7 +404,7 @@
 				<dl>
 					<dt></dt>
 					<dd>
-						<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked="checked"{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+						<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
 					</dd>
 				</dl>
 				
@@ -414,7 +414,7 @@
 						<ul class="scrollableCheckboxList">
 							{foreach from=$pageNodeList item=pageNode}
 								<li{if $pageNode->getDepth() > 1} style="padding-left: {$pageNode->getDepth()*20-20}px"{/if}>
-									<label><input type="checkbox" name="pageIDs[]" value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} checked="checked"{/if}> {$pageNode->name}</label>
+									<label><input type="checkbox" name="pageIDs[]" value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} checked{/if}> {$pageNode->name}</label>
 								</li>
 							{/foreach}
 						</ul>
diff --git a/wcfsetup/install/files/acp/templates/boxConditions.tpl b/wcfsetup/install/files/acp/templates/boxConditions.tpl
index 451b9cfc0d..75a51de98a 100644
--- a/wcfsetup/install/files/acp/templates/boxConditions.tpl
+++ b/wcfsetup/install/files/acp/templates/boxConditions.tpl
@@ -27,13 +27,13 @@
 			<dd>
 				<select name="sortField" id="sortField">
 					{foreach from=$validSortFields item=validSortField}
-						<option value="{$validSortField}"{if $validSortField == $sortField} selected="selected"{/if}>{lang}{$sortFieldLanguageItemPrefix}.{$validSortField}{/lang}</option>
+						<option value="{$validSortField}"{if $validSortField == $sortField} selected{/if}>{lang}{$sortFieldLanguageItemPrefix}.{$validSortField}{/lang}</option>
 					{/foreach}
 				</select>
 				
 				<select name="sortOrder" id="sortOrder">
-					<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-					<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+					<option value="ASC"{if $sortOrder == 'ASC'} selected{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+					<option value="DESC"{if $sortOrder == 'DESC'} selected{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
 				</select>
 				
 				{if $errorField === 'sorting'}
diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 1bf291f0fe..fdcd354f6a 100644
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -55,7 +55,7 @@
 						<select name="position" id="boxPosition">
 							<option value="0">{lang}wcf.acp.box.position{/lang}</option>
 							{foreach from=$availablePositions item=availablePosition}
-								<option value="{@$availablePosition}"{if $availablePosition == $position} selected="selected"{/if}>{@$availablePosition}</option>
+								<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{@$availablePosition}</option>
 							{/foreach}
 						</select>
 					</label>
@@ -68,8 +68,8 @@
 					<label class="selectDropdown">
 						<select name="boxType" id="boxType">
 							<option value="">{lang}wcf.acp.box.boxType{/lang}</option>
-							<option value="static"{if $boxType == 'static'} selected="selected"{/if}>{lang}wcf.acp.box.boxType.static{/lang}</option>
-							<option value="system"{if $boxType == 'system'} selected="selected"{/if}>{lang}wcf.acp.box.boxType.system{/lang}</option>
+							<option value="static"{if $boxType == 'static'} selected{/if}>{lang}wcf.acp.box.boxType.static{/lang}</option>
+							<option value="system"{if $boxType == 'system'} selected{/if}>{lang}wcf.acp.box.boxType.system{/lang}</option>
 						</select>
 					</label>
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
index f4db6d457b..fbd247187d 100644
--- a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl
@@ -46,7 +46,7 @@
 			<dt></dt>
 			<dd>
 				{foreach from=$actions item=actionObjectType}
-					<label><input type="radio" name="action" value="{@$actionObjectType->action}"{if $actionObjectType->action == $action} checked="checked"{/if}> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
+					<label><input type="radio" name="action" value="{@$actionObjectType->action}"{if $actionObjectType->action == $action} checked{/if}> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
 				{/foreach}
 				
 				{if $errorField == 'action'}
diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
index 22969743be..eee5ffbbc6 100644
--- a/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'question'} class="formError"{/if}>
 			<dt><label for="question">{lang}wcf.acp.captcha.question.question{/lang}</label></dt>
 			<dd>
-				<input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required autofocus class="long">
 				{if $errorField == 'question'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -64,7 +64,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 4ce1d4d12a..5f06921461 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -99,7 +99,7 @@
 		<dl{if $errorField == 'isDisabled'} class="formError"{/if}>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if}> {@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label>
+				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked{/if}> {@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label>
 				{hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}</small>{/hascontent}
 			</dd>
 		</dl>
diff --git a/wcfsetup/install/files/acp/templates/categoryMultiSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/categoryMultiSelectOptionType.tpl
index 491351007d..cc7cd54ab8 100644
--- a/wcfsetup/install/files/acp/templates/categoryMultiSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryMultiSelectOptionType.tpl
@@ -1,10 +1,10 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="10">
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="10">
 	{foreach from=$categoryList item=categoryItem}
-		<option value="{@$categoryItem->categoryID}"{if $categoryItem->categoryID|in_array:$value} selected="selected"{/if}>{$categoryItem->getTitle()}</option>
+		<option value="{@$categoryItem->categoryID}"{if $categoryItem->categoryID|in_array:$value} selected{/if}>{$categoryItem->getTitle()}</option>
 		
 		{if $categoryItem->hasChildren()}
 			{foreach from=$categoryItem item=subCategoryItem}
-				<option value="{@$subCategoryItem->categoryID}"{if $subCategoryItem->categoryID|in_array:$value} selected="selected"{/if}>&nbsp;&nbsp;&nbsp;&nbsp;{$subCategoryItem->getTitle()}</option>
+				<option value="{@$subCategoryItem->categoryID}"{if $subCategoryItem->categoryID|in_array:$value} selected{/if}>&nbsp;&nbsp;&nbsp;&nbsp;{$subCategoryItem->getTitle()}</option>
 			{/foreach}
 		{/if}
 	{/foreach}
diff --git a/wcfsetup/install/files/acp/templates/categoryOptionList.tpl b/wcfsetup/install/files/acp/templates/categoryOptionList.tpl
index 0d0860db0e..addb9d8a08 100644
--- a/wcfsetup/install/files/acp/templates/categoryOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryOptionList.tpl
@@ -1,5 +1,5 @@
 {foreach from=$categoryNodeList item='category'}
 	{if !$maximumNestingLevel|isset || $maximumNestingLevel == -1 || $categoryNodeList->getDepth() < $maximumNestingLevel}
-		<option value="{$category->categoryID}"{if $categoryID|isset && $categoryID == $category->categoryID} selected="selected"{/if}>{section name=i loop=$categoryNodeList->getDepth()}&nbsp;&nbsp;&nbsp;&nbsp;{/section}{$category->getTitle()}</option>
+		<option value="{$category->categoryID}"{if $categoryID|isset && $categoryID == $category->categoryID} selected{/if}>{section name=i loop=$categoryNodeList->getDepth()}&nbsp;&nbsp;&nbsp;&nbsp;{/section}{$category->getTitle()}</option>
 	{/if}
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl b/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
index ade4955da1..cc90e693d0 100644
--- a/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/checkboxesOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
index 59735a04ca..a76effacf2 100644
--- a/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/checkboxesSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked="checked"{/if}{if !$searchOption} disabled="disabled"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}" {if $key|in_array:$value} checked{/if}{if !$searchOption} disabled{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 565372afb8..fe3baef0b0 100644
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'className'} class="formError"{/if}>
 			<dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
 			<dd>
-				<input type="text" id="className" name="className" value="{$className}" required="required" autofocus="autofocus" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long">
+				<input type="text" id="className" name="className" value="{$className}" required autofocus pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long">
 				{if $errorField == 'className'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 5b191df3e1..36826fcd67 100644
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -135,10 +135,10 @@
 				<dl class="wide">
 					<dt></dt>
 					<dd class="jsImportCollection">
-						<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+						<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData} checked{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
 						<p>
 							{foreach from=$objectTypes item=objectTypeName}
-								<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData} checked="checked"{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+								<label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData} checked{/if}> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
 							{/foreach}
 						</p>
 					</dd>
@@ -154,8 +154,8 @@
 			<dl>
 				<dt><label for="userMergeMode">{lang}wcf.acp.dataImport.configure.settings.userMergeMode{/lang}</label></dt>
 				<dd>
-					<label><input type="radio" id="userMergeMode" name="userMergeMode" value="4"{if $userMergeMode == 4} checked="checked"{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
-					<label><input type="radio" name="userMergeMode" value="5"{if $userMergeMode == 5} checked="checked"{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
+					<label><input type="radio" id="userMergeMode" name="userMergeMode" value="4"{if $userMergeMode == 4} checked{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
+					<label><input type="radio" name="userMergeMode" value="5"{if $userMergeMode == 5} checked{/if}> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
 				</dd>
 			</dl>
 			
diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index d46b1400e4..c1d98840b7 100644
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -45,7 +45,7 @@
 				<dl class="col-xs-12 col-md-4">
 					<dt></dt>
 					<dd>
-						<input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" placeholder="{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}" autofocus="autofocus" class="long">
+						<input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" placeholder="{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}" autofocus class="long">
 					</dd>
 				</dl>
 				
@@ -126,7 +126,7 @@
 				{/foreach}
 				<dl>
 					<dt><label for="copyException{$exceptionKey}">{lang}wcf.acp.exceptionLog.exception.copy{/lang}</label></dt>
-					<dd><textarea id="copyException{$exceptionKey}" rows="5" cols="40" class="jsCopyException" readonly="readonly">{$exception[0]}</textarea></dd>
+					<dd><textarea id="copyException{$exceptionKey}" rows="5" cols="40" class="jsCopyException" readonly>{$exception[0]}</textarea></dd>
 				</dl>
 			</section>
 		{/foreach}
diff --git a/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
index 427d022647..353a9bf866 100644
--- a/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/exportMailAddressUserBulkProcessing.tpl
@@ -1,8 +1,8 @@
 <dl>
 	<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
 	<dd>
-		<label><input type="radio" name="fileType" value="csv"{if $fileType == 'csv'} checked="checked"{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-		<label><input type="radio" name="fileType" value="xml"{if $fileType == 'xml'} checked="checked"{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+		<label><input type="radio" name="fileType" value="csv"{if $fileType == 'csv'} checked{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+		<label><input type="radio" name="fileType" value="xml"{if $fileType == 'xml'} checked{/if}> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
 	</dd>
 </dl>
 
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index a4444a0e6c..cee8f37740 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -46,7 +46,7 @@
 					<select id="groupID" name="groupID">
 						<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 						{foreach from=$labelGroupList item=group}
-							<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
+							<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
 						{/foreach}
 					</select>
 					{if $errorField == 'groupID'}
@@ -64,7 +64,7 @@
 			<dl{if $errorField == 'label'} class="formError"{/if}>
 				<dt><label for="label">{lang}wcf.acp.label.label{/lang}</label></dt>
 				<dd>
-					<input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus="autofocus" class="long">
+					<input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus class="long">
 					{if $errorField == 'label'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
@@ -94,9 +94,9 @@
 					<ul id="labelList" class="inlineList">
 						{foreach from=$availableCssClassNames item=className}
 							{if $className == 'custom'}
-								<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
+								<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
 							{else}
-								<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
+								<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
 							{/if}
 						{/foreach}
 					</ul>
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index 1ecaf04420..a70515a623 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -54,7 +54,7 @@
 				<dl{if $errorField == 'groupName'} class="formError"{/if}>
 					<dt><label for="groupName">{lang}wcf.global.title{/lang}</label></dt>
 					<dd>
-						<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="long">
+						<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus class="long">
 						{if $errorField == 'groupName'}
 							<small class="innerError">
 								{if $errorType == 'empty' || $errorType == 'multilingual'}
@@ -86,7 +86,7 @@
 				
 				<dl>
 					<dt></dt>
-					<dd><label><input type="checkbox" name="forceSelection" id="forceSelection" value="1"{if $labelForceSelection} checked="checked"{/if}> {lang}wcf.acp.label.group.forceSelection{/lang}</label></dd>
+					<dd><label><input type="checkbox" name="forceSelection" id="forceSelection" value="1"{if $labelForceSelection} checked{/if}> {lang}wcf.acp.label.group.forceSelection{/lang}</label></dd>
 				</dl>
 				
 				<dl id="groupPermissions">
@@ -113,7 +113,7 @@
 									{foreach from=$container item=objectType}
 										<li class="{if $objectType->isCategory()} category{/if}"{if $objectType->getDepth()} style="padding-left: {21 * $objectType->getDepth()}px"{/if} data-depth="{@$objectType->getDepth()}">
 											<span>{$objectType->getLabel()}</span>
-											<label><input id="checkbox_{@$container->getObjectTypeID()}_{@$objectType->getObjectID()}" type="checkbox" name="objectTypes[{@$container->getObjectTypeID()}][]" value="{@$objectType->getObjectID()}"{if $objectType->getOptionValue()} checked="checked"{/if}></label>
+											<label><input id="checkbox_{@$container->getObjectTypeID()}_{@$objectType->getObjectID()}" type="checkbox" name="objectTypes[{@$container->getObjectTypeID()}][]" value="{@$objectType->getObjectID()}"{if $objectType->getOptionValue()} checked{/if}></label>
 										</li>
 									{/foreach}
 								</ul>
diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index b7bfacf283..6ab0384adb 100644
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -62,7 +62,7 @@
 						<select id="groupID" name="groupID">
 							<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 							{foreach from=$labelGroupList item=group}
-								<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
+								<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
 							{/foreach}
 						</select>
 					</dd>
diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 6642e53835..bfb0d90f32 100644
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'languageName'} class="formError"{/if}>
 			<dt><label for="languageName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required="required">
+				<input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required>
 				{if $errorField == 'languageName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -42,7 +42,7 @@
 		<dl{if $errorField == 'languageCode'} class="formError"{/if}>
 			<dt><label for="languageCode">{lang}wcf.acp.language.code{/lang}</label></dt>
 			<dd>
-				<input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required="required">
+				<input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required>
 				{if $errorField == 'languageCode'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -59,7 +59,7 @@
 		<dl{if $errorField == 'countryCode'} class="formError"{/if}>
 			<dt><label for="countryCode">{lang}wcf.acp.language.countryCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required="required">
+				<input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required>
 				{if $errorField == 'countryCode'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -79,7 +79,7 @@
 				<dd>
 					<select id="sourceLanguageID" name="sourceLanguageID">
 						{foreach from=$languages item=language}
-							<option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
+							<option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected{/if}>{$language->languageName} ({$language->languageCode})</option>
 						{/foreach}
 					</select>
 					{if $errorField == 'sourceLanguageID'}
diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index 5800a6b60c..1041442b18 100644
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -37,12 +37,12 @@
 		<dl>
 			<dt><label for="selectedPackages">{lang}wcf.acp.language.export.selectPackages{/lang}</label></dt>
 			<dd>
-				<select id="selectedPackages" name="selectedPackages[]" multiple="multiple" size="20" class="long monospace" dir="ltr">
-					<option value="*"{if $selectAllPackages} selected="selected"{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
+				<select id="selectedPackages" name="selectedPackages[]" multiple size="20" class="long monospace" dir="ltr">
+					<option value="*"{if $selectAllPackages} selected{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
 					<option value="-">--------------------</option>
 					{foreach from=$packages item=package}
 						{assign var=loop value=$packageNameLength-$package->packageNameLength}
-						<option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
+						<option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
 					{/foreach}
 				</select>
 			</dd>
diff --git a/wcfsetup/install/files/acp/templates/languageImport.tpl b/wcfsetup/install/files/acp/templates/languageImport.tpl
index f54a3fd7c6..8fbdb8d93c 100644
--- a/wcfsetup/install/files/acp/templates/languageImport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageImport.tpl
@@ -43,7 +43,7 @@
 			<dd>
 				<select id="sourceLanguageID" name="sourceLanguageID">
 					{foreach from=$languages item=language}
-						<option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
+						<option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected{/if}>{$language->languageName} ({$language->languageCode})</option>
 					{/foreach}
 				</select>
 				{if $errorField == 'sourceLanguageID'}
diff --git a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
index a4d46ba06e..84a63720cb 100644
--- a/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
@@ -4,7 +4,7 @@
 	<dl class="wide">
 		<dt></dt>
 		<dd>
-			<textarea rows="5" cols="60" name="languageItemValue" id="overlayLanguageItemValue"{if $item->languageItemOriginIsSystem} readonly="readonly"{/if}>{$item->languageItemValue}</textarea>
+			<textarea rows="5" cols="60" name="languageItemValue" id="overlayLanguageItemValue"{if $item->languageItemOriginIsSystem} readonly{/if}>{$item->languageItemValue}</textarea>
 		</dd>
 	</dl>
 </section>
@@ -22,7 +22,7 @@
 		
 		<dl class="wide">
 			<dt></dt>
-			<dd><label><input type="checkbox" name="languageUseCustomValue" id="overlayLanguageUseCustomValue" value="1"{if $item->languageUseCustomValue} checked="checked"{/if}> {lang}wcf.acp.language.item.useCustomValue{/lang}</label></dd>
+			<dd><label><input type="checkbox" name="languageUseCustomValue" id="overlayLanguageUseCustomValue" value="1"{if $item->languageUseCustomValue} checked{/if}> {lang}wcf.acp.language.item.useCustomValue{/lang}</label></dd>
 		</dl>
 	</section>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index e43488a297..4158f9c028 100644
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -36,7 +36,7 @@
 					<select name="id" id="languageID">
 						<option value="0">{lang}wcf.user.language{/lang}</option>
 						{foreach from=$availableLanguages item=availableLanguage}
-							<option value="{@$availableLanguage->languageID}"{if $availableLanguage->languageID == $languageID} selected="selected"{/if}>{$availableLanguage->languageName} ({$availableLanguage->languageCode})</option>
+							<option value="{@$availableLanguage->languageID}"{if $availableLanguage->languageID == $languageID} selected{/if}>{$availableLanguage->languageName} ({$availableLanguage->languageCode})</option>
 						{/foreach}
 					</select>
 				</dd>
@@ -48,7 +48,7 @@
 					<select name="languageCategoryID" id="languageCategoryID">
 						<option value="0">{lang}wcf.acp.language.category{/lang}</option>
 						{foreach from=$availableLanguageCategories item=availableLanguageCategory}
-							<option value="{@$availableLanguageCategory->languageCategoryID}"{if $availableLanguageCategory->languageCategoryID == $languageCategoryID} selected="selected"{/if}>{$availableLanguageCategory->languageCategory}</option>
+							<option value="{@$availableLanguageCategory->languageCategoryID}"{if $availableLanguageCategory->languageCategoryID == $languageCategoryID} selected{/if}>{$availableLanguageCategory->languageCategory}</option>
 						{/foreach}
 					</select>
 				</dd>
@@ -65,7 +65,7 @@
 				<dt></dt>
 				<dd>
 					<input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" placeholder="{lang}wcf.acp.language.item.value{/lang}" class="long">
-					<label><input type="checkbox" name="hasCustomValue" value="1"{if $hasCustomValue == 1} checked="checked"{/if}> {lang}wcf.acp.language.item.customValues{/lang}</label>
+					<label><input type="checkbox" name="hasCustomValue" value="1"{if $hasCustomValue == 1} checked{/if}> {lang}wcf.acp.language.item.customValues{/lang}</label>
 				</dd>
 			</dl>
 			
diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 2c2ec70acd..10eec182a7 100644
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -32,7 +32,7 @@
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
 	<section class="section">
 		<header class="sectionHeader">
-			<h2 class="sectionTitle"><label><input type="checkbox" id="enable" name="enable" value="1"{if $enable} checked="checked"{/if}> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></h2>
+			<h2 class="sectionTitle"><label><input type="checkbox" id="enable" name="enable" value="1"{if $enable} checked{/if}> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></h2>
 			<small class="sectionDescription">{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
 		</header>
 		
@@ -40,7 +40,7 @@
 			<dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
 			<dd class="floated">
 				{foreach from=$languages item='language'}
-					<label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if}> {$language}</label>
+					<label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked disabled{elseif $language->languageID|in_array:$languageIDs} checked{/if}> {$language}</label>
 				{/foreach}
 				
 				{if $errorField == 'languageIDs'}
diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
index aad80bf13c..5fab7274a9 100644
--- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'server'} class="formError"{/if}>
 			<dt><label for="server">{lang}wcf.acp.languageServer.server{/lang}</label></dt>
 			<dd>
-				<input type="text" name="server" id="server" value="{$server}" autofocus="autofocus" class="long">
+				<input type="text" name="server" id="server" value="{$server}" autofocus class="long">
 				{if $errorField == 'server'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
diff --git a/wcfsetup/install/files/acp/templates/mediaAdd.tpl b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
index a9e35652a7..d2c9ebf96f 100644
--- a/wcfsetup/install/files/acp/templates/mediaAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaAdd.tpl
@@ -69,7 +69,7 @@
 				<dt></dt>
 				<dd>
 					<label>
-						<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1"{if $isMultilingual} checked="checked"{/if}>
+						<input type="checkbox" id="isMultilingual" name="isMultilingual" value="1"{if $isMultilingual} checked{/if}>
 						<span>{lang}wcf.media.isMultilingual{/lang}</span>
 					</label>
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 66c5fe6541..864c4d0140 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -28,7 +28,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="long">
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus class="long">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'title' || $errorType == 'multilingual'}
@@ -49,7 +49,7 @@
 				<dd>
 					<select name="position" id="position">
 						{foreach from=$availablePositions item=availablePosition}
-							<option value="{@$availablePosition}"{if $availablePosition == $position} selected="selected"{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
+							<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
 						{/foreach}
 					</select>
 					
@@ -91,23 +91,23 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked="checked"{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
+					<label><input type="checkbox" id="showHeader" name="showHeader" value="1"{if $showHeader} checked{/if}> {lang}wcf.acp.box.showHeader{/lang}</label>
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked="checked"{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+					<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
 				</dd>
 			</dl>
 			
 			<dl>
 				<dt><label for="pageIDs">{lang}wcf.acp.box.pageIDs{/lang}</label></dt>
 				<dd>
-					<select name="pageIDs[]" id="pageIDs" multiple="multiple" size="20">
+					<select name="pageIDs[]" id="pageIDs" multiple size="20">
 						{foreach from=$pageNodeList item=pageNode}
-							<option value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+							<option value="{@$pageNode->pageID}"{if $pageNode->pageID|in_array:$pageIDs} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
 						{/foreach}
 					</select>
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 4f26fd2cc3..4b3f25eef9 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -48,7 +48,7 @@
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
 					{foreach from=$menuItemNodeList item=menuItemNode}
-						<option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentItemID} selected="selected"{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->title}{/lang}</option>
+						<option value="{@$menuItemNode->itemID}"{if $menuItemNode->itemID == $parentItemID} selected{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->title}{/lang}</option>
 					{/foreach}
 				</select>
 				{if $errorField == 'parentItemID'}
@@ -66,7 +66,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" name="title" id="title" value="{$title}" class="long" required="required">
+				<input type="text" name="title" id="title" value="{$title}" class="long" required>
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'multilingual'}
@@ -90,8 +90,8 @@
 		<dl>
 			<dt></dt>
 			<dd class="floated">
-				<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if}> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
-				<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if}> {lang}wcf.acp.menu.item.link.external{/lang}</label>
+				<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked{/if}> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
+				<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked{/if}> {lang}wcf.acp.menu.item.link.external{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -102,7 +102,7 @@
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
 					{foreach from=$pageNodeList item=pageNode}
-						<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $pageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+						<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $pageID} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
 					{/foreach}
 				</select>
 				{if $errorField == 'pageID'}
@@ -171,7 +171,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
+					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked{/if}> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
 				</dd>
 			</dl>
 		{/if}
diff --git a/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
index 18e6f0ecf6..94bc74071b 100644
--- a/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl
@@ -1,5 +1,5 @@
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}">
 	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		<option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
 </select>
diff --git a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
index 84bb0cfb60..a0de775922 100644
--- a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
@@ -1,7 +1,7 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
-<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled{/if}>
 	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		<option value="{$key}"{if $key|in_array:$value} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
 </select>
 
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 4b1635e6e4..8d41d71b00 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -47,7 +47,7 @@
 		<dl{if $errorField == 'noticeName'} class="formError"{/if}>
 			<dt><label for="noticeName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required autofocus class="long">
 				{if $errorField == 'noticeName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -82,7 +82,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked="checked"{/if}> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
+				<label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked{/if}> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -105,9 +105,9 @@
 			<dd>
 				{foreach from=$availableCssClassNames item=className}
 					{if $className == 'custom'}
-						<label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium"></span></label>
+						<label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium"></span></label>
 					{else}
-						<label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
+						<label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked{/if}> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
 					{/if}
 				{/foreach}
 				{if $errorField == 'cssClassName'}
@@ -128,14 +128,14 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.notice.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.notice.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked="checked"{/if}> {lang}wcf.acp.notice.isDismissible{/lang}</label>
+				<label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked{/if}> {lang}wcf.acp.notice.isDismissible{/lang}</label>
 				<small>{lang}wcf.acp.notice.isDismissible.description{/lang}</small>
 			</dd>
 		</dl>
@@ -144,7 +144,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked="checked"{/if}> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
+					<label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked{/if}> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
 					<small>{lang}wcf.acp.notice.resetIsDismissed.description{/lang}</small>
 				</dd>
 			</dl>
diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
index 1944ca91da..70192dd249 100644
--- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
@@ -39,7 +39,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked="checked"{/if}> {lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers{/lang}</label>
+					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked{/if}> {lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers{/lang}</label>
 					<small>{lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers.description{/lang}</small>	
 				</dd>
 			</dl>
@@ -55,14 +55,14 @@
 						<dd>
 							<ol class="flexibleButtonGroup" data-object-id="{@$event->eventID}">
 								<li>
-									<input type="radio" id="settings_{@$event->eventID}_disabled" name="settings[{@$event->eventID}][enabled]" value="0"{if $settings[$event->eventID][enabled]|empty} checked="checked"{/if}>
+									<input type="radio" id="settings_{@$event->eventID}_disabled" name="settings[{@$event->eventID}][enabled]" value="0"{if $settings[$event->eventID][enabled]|empty} checked{/if}>
 									<label for="settings_{@$event->eventID}_disabled" class="red">
 										<span class="icon icon16 fa-times"></span>
 										{lang}wcf.user.notification.notifications.disabled{/lang}
 									</label>
 								</li>
 								<li class="spaceAfter">
-									<input type="radio" id="settings_{@$event->eventID}_enabled" name="settings[{@$event->eventID}][enabled]" value="1"{if !$settings[$event->eventID][enabled]|empty} checked="checked"{/if}>
+									<input type="radio" id="settings_{@$event->eventID}_enabled" name="settings[{@$event->eventID}][enabled]" value="1"{if !$settings[$event->eventID][enabled]|empty} checked{/if}>
 									<label for="settings_{@$event->eventID}_enabled" class="green">
 										<span class="icon icon16 fa-bell"></span>
 										{lang}wcf.user.notification.notifications.enabled{/lang}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 8cb3bd62b4..36d9858108 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -22,7 +22,7 @@
 	<section class="section" class="jsPackageUpdate" data-package="{$update[package]}">
 		<header class="sectionHeader">
 			<h2 class="sectionTitle"><label>
-				<input type="checkbox" value="1" checked="checked">
+				<input type="checkbox" value="1" checked>
 				{$update[packageName]|language}
 			</label></h2>
 			{if $update[packageDescription]}<small class="sectionDescription">{$update[packageDescription]|language}</small>{/if}
@@ -43,7 +43,7 @@
 			<dd>
 				<select>
 					{foreach from=$update[versions] item=version}
-						<option value="{@$version[packageVersion]}"{if $version[packageVersion] == $update[version][packageVersion]} selected="selected"{/if}>{$version[packageVersion]}</option>
+						<option value="{@$version[packageVersion]}"{if $version[packageVersion] == $update[version][packageVersion]} selected{/if}>{$version[packageVersion]}</option>
 					{/foreach}
 				</select>
 			</dd>
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
index 1220aa6a62..55cdbec297 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
@@ -29,7 +29,7 @@
 		<dl{if $errorField == 'serverURL'} class="formError"{/if}>
 			<dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
 			<dd>
-				<input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required="required" autofocus="autofocus" class="long">
+				<input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required autofocus class="long">
 				{if $errorField == 'serverURL'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index 4478060b4d..53a7ef4ad8 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -70,7 +70,7 @@
 				<dl{if $errorField == 'name'} class="formError"{/if}>
 					<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 					<dd>
-						<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
+						<input type="text" id="name" name="name" value="{$name}" required autofocus class="long">
 						{if $errorField == 'name'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -86,11 +86,11 @@
 				<dl{if $errorField == 'parentPageID'} class="formError"{/if}>
 					<dt><label for="parentPageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
 					<dd>
-						<select name="parentPageID" id="parentPageID"{if $action == 'edit' && $page->originIsSystem} disabled="disabled"{/if}>
+						<select name="parentPageID" id="parentPageID"{if $action == 'edit' && $page->originIsSystem} disabled{/if}>
 							<option value="0">{lang}wcf.acp.page.parentPageID.noParentPage{/lang}</option>
 							
 							{foreach from=$pageNodeList item=pageNode}
-								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $parentPageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $parentPageID} selected{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
 							{/foreach}
 						</select>
 						{if $errorField == 'parentPageID'}
@@ -108,9 +108,9 @@
 				<dl{if $errorField == 'applicationPackageID'} class="formError"{/if}>
 					<dt><label for="applicationPackageID">{lang}wcf.acp.page.applicationPackageID{/lang}</label></dt>
 					<dd>
-						<select name="applicationPackageID" id="applicationPackageID"{if $action == 'edit' && $page->originIsSystem} disabled="disabled"{/if}>
+						<select name="applicationPackageID" id="applicationPackageID"{if $action == 'edit' && $page->originIsSystem} disabled{/if}>
 							{foreach from=$availableApplications item=availableApplication}
-								<option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $applicationPackageID} selected="selected"{/if}>{$availableApplication->getAbbreviation()}: {$availableApplication->domainName}{$availableApplication->domainPath}</option>
+								<option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $applicationPackageID} selected{/if}>{$availableApplication->getAbbreviation()}: {$availableApplication->domainName}{$availableApplication->domainPath}</option>
 							{/foreach}
 						</select>
 						{if $errorField == 'applicationPackageID'}
@@ -166,7 +166,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1"{if $isLandingPage} checked="checked"{/if}{if $action == 'edit' && $page->isLandingPage} disabled="disabled"{/if}> {lang}wcf.acp.page.isLandingPage{/lang}</label>
+							<label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1"{if $isLandingPage} checked{/if}{if $action == 'edit' && $page->isLandingPage} disabled{/if}> {lang}wcf.acp.page.isLandingPage{/lang}</label>
 						</dd>
 					</dl>
 				{/if}
@@ -175,7 +175,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="isDisabled" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.page.isDisabled{/lang}</label>
+							<label><input type="checkbox" id="isDisabled" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.page.isDisabled{/lang}</label>
 						</dd>
 					</dl>
 				{/if}
@@ -347,7 +347,7 @@
 						<ul class="scrollableCheckboxList">
 							{foreach from=$availableBoxes item=availableBox}
 								<li>
-									<label><input type="checkbox" name="boxIDs[]" value="{@$availableBox->boxID}"{if $availableBox->boxID|in_array:$boxIDs} checked="checked"{/if}{if $availableBox->identifier == 'com.woltlab.wcf.MainMenu'} disabled{/if}> {$availableBox->name}</label>
+									<label><input type="checkbox" name="boxIDs[]" value="{@$availableBox->boxID}"{if $availableBox->boxID|in_array:$boxIDs} checked{/if}{if $availableBox->identifier == 'com.woltlab.wcf.MainMenu'} disabled{/if}> {$availableBox->name}</label>
 								</li>
 							{/foreach}
 						</ul>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
index 6f966ee806..08f750a0d4 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
@@ -12,7 +12,7 @@
 			</ul>
 		</div>
 		
-		<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" required="required" value="" data-toggle="search">
+		<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" required value="" data-toggle="search">
 		
 		<button class="pageHeaderSearchInputButton" type="submit">
 			<span class="icon icon16 pointer fa-search" title="{lang}wcf.global.search{/lang}"></span>
diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index 7430f334cb..dd704dd4d8 100644
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -56,7 +56,7 @@
 						<select name="applicationPackageID" id="applicationPackageID">
 							<option value="0">{lang}wcf.acp.page.applicationPackageID{/lang}</option>
 							{foreach from=$availableApplications item=availableApplication}
-								<option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $applicationPackageID} selected="selected"{/if}>{$availableApplication->getAbbreviation()}: {$availableApplication->domainName}{$availableApplication->domainPath}</option>
+								<option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $applicationPackageID} selected{/if}>{$availableApplication->getAbbreviation()}: {$availableApplication->domainName}{$availableApplication->domainPath}</option>
 							{/foreach}
 						</select>
 					</label>
@@ -69,8 +69,8 @@
 					<label class="selectDropdown">
 						<select name="pageType" id="pageType">
 							<option value="">{lang}wcf.acp.page.pageType{/lang}</option>
-							<option value="static"{if $pageType == 'static'} selected="selected"{/if}>{lang}wcf.acp.page.pageType.static{/lang}</option>
-							<option value="system"{if $pageType == 'system'} selected="selected"{/if}>{lang}wcf.acp.page.pageType.system{/lang}</option>
+							<option value="static"{if $pageType == 'static'} selected{/if}>{lang}wcf.acp.page.pageType.static{/lang}</option>
+							<option value="system"{if $pageType == 'system'} selected{/if}>{lang}wcf.acp.page.pageType.system{/lang}</option>
 						</select>
 					</label>
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
index 97d9eb1b5a..ac76524bae 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
@@ -44,7 +44,7 @@
 		<dl{if $errorField == 'title'} class="formError"{/if}>
 			<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="medium">
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus class="medium">
 				{if $errorField == 'title'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -86,7 +86,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
 				<small>{lang}wcf.acp.paidSubscription.isDisabled.description{/lang}</small>
 			</dd>
 		</dl>
@@ -96,7 +96,7 @@
 				<dt>{lang}wcf.acp.paidSubscription.excludedSubscriptions{/lang}</dt>
 				<dd>
 					{foreach from=$availableSubscriptions item=availableSubscription}
-						<label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs} checked="checked"{/if}> {$availableSubscription->title|language}</label>
+						<label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs} checked{/if}> {$availableSubscription->title|language}</label>
 					{/foreach}
 					<small>{lang}wcf.acp.paidSubscription.excludedSubscriptions.description{/lang}</small>
 				</dd>
@@ -131,7 +131,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1"{if !$subscriptionLength} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
+				<label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1"{if !$subscriptionLength} checked{/if}> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
 			</dd>
 		</dl>
 		
@@ -140,9 +140,9 @@
 			<dd>
 				<input type="number" id="subscriptionLength" name="subscriptionLength" value="{@$subscriptionLength}" class="tiny">
 				<select name="subscriptionLengthUnit" id="subscriptionLengthUnit">
-					<option value="D"{if $subscriptionLengthUnit == 'D'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.D{/lang}</option>
-					<option value="M"{if $subscriptionLengthUnit == 'M'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.M{/lang}</option>
-					<option value="Y"{if $subscriptionLengthUnit == 'Y'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.Y{/lang}</option>
+					<option value="D"{if $subscriptionLengthUnit == 'D'} selected{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.D{/lang}</option>
+					<option value="M"{if $subscriptionLengthUnit == 'M'} selected{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.M{/lang}</option>
+					<option value="Y"{if $subscriptionLengthUnit == 'Y'} selected{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.Y{/lang}</option>
 				</select>
 				{if $errorField == 'subscriptionLength'}
 					<small class="innerError">
@@ -159,7 +159,7 @@
 		<dl id="isRecurringDL">
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="isRecurring" value="1"{if $isRecurring} checked="checked"{/if}> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
+				<label><input type="checkbox" name="isRecurring" value="1"{if $isRecurring} checked{/if}> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
 				<small>{lang}wcf.acp.paidSubscription.isRecurring.description{/lang}</small>
 			</dd>
 		</dl>
@@ -168,7 +168,7 @@
 			<dt><label>{lang}wcf.acp.paidSubscription.userGroups{/lang}</label></dt>
 			<dd>
 				{foreach from=$availableUserGroups item=userGroup}
-					<label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}"{if $userGroup->groupID|in_array:$groupIDs} checked="checked"{/if}> {$userGroup->groupName|language}</label>
+					<label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}"{if $userGroup->groupID|in_array:$groupIDs} checked{/if}> {$userGroup->groupName|language}</label>
 				{/foreach}
 				{if $errorField == 'groupIDs'}
 					<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
index 2f471b55af..89e38ba7ea 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
@@ -49,7 +49,7 @@
 						<select name="subscriptionID" id="subscriptionID">
 							<option value="0">{lang}wcf.acp.paidSubscription.subscription{/lang}</option>
 							{foreach from=$availableSubscriptions item=availableSubscription}
-								<option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected="selected"{/if}>{$availableSubscription->title|language}</option>
+								<option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected{/if}>{$availableSubscription->title|language}</option>
 							{/foreach}
 						</select>
 					</dd>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
index 9b36abab3b..7f091c392b 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
@@ -35,7 +35,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" autofocus class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
index 5ca2fb661c..773bbc14c5 100644
--- a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}"{if $key|in_array:$value} checked="checked"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$key}"{if $key|in_array:$value} checked{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
index fbcf5c0cef..2ec3f82186 100644
--- a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl
@@ -1,3 +1,3 @@
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
diff --git a/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
index 4391f287cd..cd4c9d1ed9 100644
--- a/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
@@ -1,6 +1,6 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
 {foreach from=$selectOptions key=key item=selectOption}
-	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang}</label>
 {/foreach}
 
 <script data-relocate="true">
diff --git a/wcfsetup/install/files/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
index bd220fe3cb..d05e0ffd09 100644
--- a/wcfsetup/install/files/acp/templates/selectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
@@ -1,6 +1,6 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
 	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
 	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		<option value="{$key}"{if $value == $key} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
 </select>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
index c671458872..611a5e959f 100644
--- a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
@@ -1,8 +1,8 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
-<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if}>
 	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
 	{foreach from=$selectOptions key=key item=selectOption}
-		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+		<option value="{$key}"{if $value == $key} selected{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
 </select>
 
diff --git a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
index 71654fd1b1..91a8a0eedc 100644
--- a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
@@ -39,7 +39,7 @@
 <dl>
 	<dt></dt>
 	<dd>
-		<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked="checked"{/if}> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+		<label for="enableHTML"><input type="checkbox" id="enableHTML" name="enableHTML" value="1"{if $enableHTML == 1} checked{/if}> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
 	</dd>
 </dl>
 
diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index ba0b8d5f0d..571ca95866 100644
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'smileyTitle'} class="formError"{/if}>
 			<dt><label for="smileyTitle">{lang}wcf.acp.smiley.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus="autofocus" class="long">
+				<input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus class="long">
 				
 				{if $errorField == 'smileyTitle'}
 					<small class="innerError">
@@ -44,7 +44,7 @@
 			<dt><label for="categoryID">{lang}wcf.acp.smiley.categoryID{/lang}</label></dt>
 			<dd>
 				<select id="categoryID" name="categoryID">
-					<option value="0"{if $categoryID === null} selected="selected"{/if}>{lang}wcf.acp.smiley.categoryID.default{/lang}</option>
+					<option value="0"{if $categoryID === null} selected{/if}>{lang}wcf.acp.smiley.categoryID.default{/lang}</option>
 					{include file='categoryOptionList'}
 				</select>
 				
@@ -63,7 +63,7 @@
 		<dl{if $errorField == 'smileyCode'} class="formError"{/if}>
 			<dt><label for="smileyCode">{lang}wcf.acp.smiley.smileyCode{/lang}</label></dt>
 			<dd>
-				<input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required="required" class="medium">
+				<input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required class="medium">
 				
 				{if $errorField == 'smileyCode'}
 					<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/stat.tpl b/wcfsetup/install/files/acp/templates/stat.tpl
index 0d7ec92903..8e784b8db3 100644
--- a/wcfsetup/install/files/acp/templates/stat.tpl
+++ b/wcfsetup/install/files/acp/templates/stat.tpl
@@ -40,7 +40,7 @@
 	<dl>
 		<dt><label>{lang}wcf.acp.stat.dateGrouping{/lang}</label></dt>
 		<dd>
-			<label><input type="radio" name="dateGrouping" value="daily" checked="checked"> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
+			<label><input type="radio" name="dateGrouping" value="daily" checked> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
 			<label><input type="radio" name="dateGrouping" value="weekly"> {lang}wcf.acp.stat.dateGrouping.weekly{/lang}</label>
 			<label><input type="radio" name="dateGrouping" value="monthly"> {lang}wcf.acp.stat.dateGrouping.monthly{/lang}</label>
 			<label><input type="radio" name="dateGrouping" value="yearly"> {lang}wcf.acp.stat.dateGrouping.yearly{/lang}</label>
@@ -50,7 +50,7 @@
 	<dl>
 		<dt><label>{lang}wcf.acp.stat.value{/lang}</label></dt>
 		<dd>
-			<label><input type="radio" name="value" value="counter" checked="checked"> {lang}wcf.acp.stat.value.counter{/lang}</label>
+			<label><input type="radio" name="value" value="counter" checked> {lang}wcf.acp.stat.value.counter{/lang}</label>
 			<label><input type="radio" name="value" value="total"> {lang}wcf.acp.stat.value.total{/lang}</label>
 		</dd>
 	</dl>
@@ -64,7 +64,7 @@
 			<dt><label>{lang}wcf.acp.stat.category.{@$categoryName}{/lang}</label></dt>
 			<dd>
 				{foreach from=$objectTypes item=objectType}
-					<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}"{if $objectType->default} checked="checked"{/if}> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
+					<label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}"{if $objectType->default} checked{/if}> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
 				{/foreach}
 			</dd>
 		</dl>
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 2525bf96a9..b25662d384 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -250,7 +250,7 @@
 							<select name="templateGroupID" id="templateGroupID">
 								<option value="0">{lang}wcf.acp.template.group.default{/lang}</option>
 								{foreach from=$availableTemplateGroups item=templateGroup}
-									<option value="{@$templateGroup->templateGroupID}"{if $templateGroup->templateGroupID == $templateGroupID} selected="selected"{/if}>{$templateGroup->templateGroupName}</option>
+									<option value="{@$templateGroup->templateGroupID}"{if $templateGroup->templateGroupID == $templateGroupID} selected{/if}>{$templateGroup->templateGroupName}</option>
 								{/foreach}
 							</select>
 							{if $errorField == 'templateGroupID'}
@@ -297,7 +297,7 @@
 				<dl>
 					<dt></dt>
 					<dd><label>
-						<input type="checkbox" id="useFluidLayout" name="useFluidLayout" value="1"{if $variables[useFluidLayout]} checked="checked"{/if}>
+						<input type="checkbox" id="useFluidLayout" name="useFluidLayout" value="1"{if $variables[useFluidLayout]} checked{/if}>
 						<span>{lang}wcf.acp.style.globals.useFluidLayout{/lang}</span>
 					</label></dd>
 				</dl>
@@ -309,7 +309,7 @@
 						<label class="selectDropdown">
 							<select name="wcfLayoutMinWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfLayoutMinWidth_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfLayoutMinWidth_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -322,7 +322,7 @@
 						<label class="selectDropdown">
 							<select name="wcfLayoutMaxWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfLayoutMaxWidth_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfLayoutMaxWidth_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -336,7 +336,7 @@
 						<label class="selectDropdown">
 							<select name="wcfLayoutFixedWidth_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfLayoutFixedWidth_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfLayoutFixedWidth_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -385,7 +385,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontSizeDefault_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfFontSizeDefault_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfFontSizeDefault_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -398,7 +398,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontSizeSmall_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfFontSizeSmall_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfFontSizeSmall_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -411,7 +411,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontSizeHeadline_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfFontSizeHeadline_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfFontSizeHeadline_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -424,7 +424,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontSizeSection_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfFontSizeSection_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfFontSizeSection_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -437,7 +437,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontSizeTitle_unit" class="jsUnitSelect">
 								{foreach from=$availableUnits item=unit}
-									<option value="{@$unit}"{if $variables[wcfFontSizeTitle_unit] == $unit} selected="selected"{/if}>{@$unit}</option>
+									<option value="{@$unit}"{if $variables[wcfFontSizeTitle_unit] == $unit} selected{/if}>{@$unit}</option>
 								{/foreach}
 							</select>
 						</label>
@@ -447,7 +447,7 @@
 				<dl>
 					<dt></dt>
 					<dd><label>
-						<input type="checkbox" id="useGoogleFont" name="useGoogleFont" value="1"{if $variables[useGoogleFont]} checked="checked"{/if}>
+						<input type="checkbox" id="useGoogleFont" name="useGoogleFont" value="1"{if $variables[useGoogleFont]} checked{/if}>
 						<span>{lang}wcf.acp.style.globals.useGoogleFont{/lang}</span>
 					</label></dd>
 				</dl>
@@ -463,7 +463,7 @@
 						<label class="selectDropdown">
 							<select name="wcfFontFamilyFallback" id="wcfFontFamilyFallback">
 								{foreach from=$availableFontFamilies key=fontFamily item=primaryFont}
-									<option value='{@$fontFamily}'{if $variables[wcfFontFamilyFallback] == $fontFamily} selected="selected"{/if}>{@$primaryFont}</option>
+									<option value='{@$fontFamily}'{if $variables[wcfFontFamilyFallback] == $fontFamily} selected{/if}>{@$primaryFont}</option>
 								{/foreach}
 							</select>
 						</label>
diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index d0569cfec0..f773f5deb5 100644
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -26,13 +26,13 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked="checked"{/if}{if !$canExportImages} disabled="disabled"{/if}> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
+				<label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked{/if}{if !$canExportImages} disabled{/if}> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
 			</dd>
 		</dl>
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if}> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
+				<label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked{/if}{if !$canExportTemplates} disabled{/if}> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
 			</dd>
 		</dl>
 		
@@ -49,7 +49,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if}> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
+					<label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked{/if}> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
 				</dd>
 			</dl>
 			
diff --git a/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl b/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
index bbf2d0983f..56cf45cb5b 100644
--- a/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
+++ b/wcfsetup/install/files/acp/templates/styleVariableUnit.tpl
@@ -3,10 +3,10 @@
 	<dd>
 		<input type="number" name="{$variableName}" id="{$variableName}" value="{$variableValue}">
 		<select name="{$variableName}_unit" id="{$variableName}_unit">
-			<option value="%"{if $variableUnit == '%'} selected="selected"{/if}>%</option>
-			<option value="em"{if $variableUnit == 'em'} selected="selected"{/if}>em</option>
-			<option value="pt"{if $variableUnit == 'pt'} selected="selected"{/if}>pt</option>
-			<option value="px"{if $variableUnit == 'px'} selected="selected"{/if}>px</option>
+			<option value="%"{if $variableUnit == '%'} selected{/if}>%</option>
+			<option value="em"{if $variableUnit == 'em'} selected{/if}>em</option>
+			<option value="pt"{if $variableUnit == 'pt'} selected{/if}>pt</option>
+			<option value="px"{if $variableUnit == 'px'} selected{/if}>px</option>
 		</select>
 	</dd>
 </dl>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index 89e1a6a7f0..891b605229 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -25,7 +25,7 @@
 		<dl{if $errorField == 'name'} class="formError"{/if}>
 			<dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="name" name="name" value="{$name}" required autofocus class="long">
 				{if $errorField == 'name'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -42,10 +42,10 @@
 			<dl{if $errorField == 'languageID' || $action == 'edit'} class="{if $action == 'edit'}disabled{else}formError{/if}"{/if}>
 				<dt><label for="languageID">{lang}wcf.acp.tag.languageID{/lang}</label></dt>
 				<dd>
-					<select id="languageID" name="languageID"{if $action == 'edit'} disabled="disabled"{/if}>
+					<select id="languageID" name="languageID"{if $action == 'edit'} disabled{/if}>
 						{content}
 							{foreach from=$availableLanguages item=language}
-								<option value="{@$language->languageID}"{if $languageID == $language->languageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
+								<option value="{@$language->languageID}"{if $languageID == $language->languageID} selected{/if}>{$language->languageName} ({$language->languageCode})</option>
 							{/foreach}
 						{/content}
 					</select>
diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 9143c38781..825de73aa4 100644
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -40,7 +40,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<input type="text" id="tagSearch" name="search" value="{$search}" placeholder="{lang}wcf.acp.tag.list.search.query{/lang}" autofocus="autofocus" class="medium">
+					<input type="text" id="tagSearch" name="search" value="{$search}" placeholder="{lang}wcf.acp.tag.list.search.query{/lang}" autofocus class="medium">
 				</dd>
 			</dl>
 		</section>
diff --git a/wcfsetup/install/files/acp/templates/templateAdd.tpl b/wcfsetup/install/files/acp/templates/templateAdd.tpl
index 2c39f71219..fb2ba64cbf 100644
--- a/wcfsetup/install/files/acp/templates/templateAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateAdd.tpl
@@ -37,7 +37,7 @@
 			<dl{if $errorField == 'tplName'} class="formError"{/if}>
 				<dt><label for="tplName">{lang}wcf.global.name{/lang}</label></dt>
 				<dd>
-					<input type="text" id="tplName" name="tplName" value="{$tplName}" required="required" class="long">
+					<input type="text" id="tplName" name="tplName" value="{$tplName}" required class="long">
 					{if $errorField == 'tplName'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index 6670d537b5..db6b66eda5 100644
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -37,7 +37,7 @@
 					<option value="0"></option>
 					{assign var=depth value=0}
 					{foreach from=$templateGroupHierarchy item='templateGroup' key='templateGroupID'}
-						<option{if $templateGroup[hasTemplate] !== false && $templateGroup[hasTemplate] != $templateID} value="{$templateGroup[hasTemplate]}"{if $parent->templateID == $templateGroup[hasTemplate]} selected="selected"{/if}{else} disabled="disabled"{/if}>{@'&nbsp;'|str_repeat:$depth * 4}{if $templateGroupID}{$templateGroup[group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}</option>
+						<option{if $templateGroup[hasTemplate] !== false && $templateGroup[hasTemplate] != $templateID} value="{$templateGroup[hasTemplate]}"{if $parent->templateID == $templateGroup[hasTemplate]} selected{/if}{else} disabled{/if}>{@'&nbsp;'|str_repeat:$depth * 4}{if $templateGroupID}{$templateGroup[group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}</option>
 						{assign var=depth value=$depth + 1}
 					{/foreach}
 				</select>
diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index 71f79314e8..7eff8cbb96 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -46,7 +46,7 @@
 		<dl{if $errorField == 'templateGroupName'} class="formError"{/if}>
 			<dt><label for="templateGroupName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required="required" class="long">
+				<input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required class="long">
 				{if $errorField == 'templateGroupName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -62,7 +62,7 @@
 		<dl{if $errorField == 'templateGroupFolderName'} class="formError"{/if}>
 			<dt><label for="templateGroupFolderName">{lang}wcf.acp.template.group.folderName{/lang}</label></dt>
 			<dd>
-				<input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required="required" class="long">
+				<input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required class="long">
 				{if $errorField == 'templateGroupFolderName'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index 3c4cb1a1ce..7c0f08b0e5 100644
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -60,7 +60,7 @@
 						<select name="application" id="application">
 							<option value="">{lang}wcf.acp.template.application{/lang}</option>
 							{foreach from=$availableApplications key=abbreviation item=availableApplication}
-								<option value="{$abbreviation}"{if $abbreviation == $application} selected="selected"{/if}>{$availableApplication}</option>
+								<option value="{$abbreviation}"{if $abbreviation == $application} selected{/if}>{$availableApplication}</option>
 							{/foreach}
 						</select>
 					</dd>
diff --git a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
index b16f8c98d4..81c0de79b4 100644
--- a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if}>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled{/if}>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
index 33d4a793e2..8c9f10a4e1 100644
--- a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl
@@ -1,5 +1,5 @@
-<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
-<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if} cols="40" rows="10">{$value}</textarea>
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked{/if}> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<textarea id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled{/if} cols="40" rows="10">{$value}</textarea>
 
 <script data-relocate="true">
 //<![CDATA[
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 30a6c36737..68381f7b6d 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -39,7 +39,7 @@
 			<dl{if $errorField == $objectType->objectTypeID} class="formError"{/if}>
 				<dt><label for="{@$objectType->objectType}">{lang}wcf.user.activityPoint.objectType.{$objectType->objectType}{/lang}</label></dt>
 				<dd>
-					<input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny">
+					<input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required min="0" class="tiny">
 					{if $errorField == $objectType->objectTypeID}
 						<small class="innerError">
 							{lang greaterThan=-1}wcf.global.form.error.greaterThan{/lang}
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 22aa740f31..7ae6f87b5e 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -60,7 +60,7 @@
 				<dl{if $errorType.username|isset} class="formError"{/if}>
 					<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
 					<dd>
-						<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus="autofocus" class="medium">
+						<input type="text" id="username" name="username" value="{$username}" pattern="^[^,\n]+$" autofocus class="medium">
 						{if $errorType.username|isset}
 							<small class="innerError">
 								{if $errorType.username == 'empty'}
@@ -166,7 +166,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="checkbox" id="banned" name="banned" value="1"{if $banned == 1} checked="checked"{/if}> {lang}wcf.acp.user.banUser{/lang}</label>
+							<label><input type="checkbox" id="banned" name="banned" value="1"{if $banned == 1} checked{/if}> {lang}wcf.acp.user.banUser{/lang}</label>
 							<small>{lang}wcf.acp.user.banUser.description{/lang}</small>	
 						</dd>
 					</dl>
@@ -181,7 +181,7 @@
 					
 					<dl>
 						<dt></dt>
-						<dd><label><input type="checkbox" id="banNeverExpires" name="banNeverExpires" value="1"{if !$banExpires} checked="checked"{/if}> {lang}wcf.acp.user.ban.neverExpires{/lang}</label></dd>
+						<dd><label><input type="checkbox" id="banNeverExpires" name="banNeverExpires" value="1"{if !$banExpires} checked{/if}> {lang}wcf.acp.user.ban.neverExpires{/lang}</label></dd>
 					</dl>
 					
 					<dl id="banExpiresSetting">
@@ -250,7 +250,7 @@
 									</dt>
 									<dd>
 										{foreach from=$availableContentLanguages key=availableLanguageID item=availableLanguage}
-											<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked="checked"{/if}> {@$availableLanguage}</label>
+											<label><input type="checkbox" name="visibleLanguages[]" value="{@$availableLanguageID}"{if $availableLanguageID|in_array:$visibleLanguages} checked{/if}> {@$availableLanguage}</label>
 										{/foreach}
 									</dd>
 								</dl>
@@ -301,9 +301,9 @@
 					<dl>
 						<dt>{lang}wcf.message.settings{/lang}</dt>
 						<dd>
-							<label><input id="signatureEnableSmilies" name="signatureEnableSmilies" type="checkbox" value="1"{if $signatureEnableSmilies} checked="checked"{/if}> {lang}wcf.message.settings.enableSmilies{/lang}</label>
-							<label><input id="signatureEnableBBCodes" name="signatureEnableBBCodes" type="checkbox" value="1"{if $signatureEnableBBCodes} checked="checked"{/if}> {lang}wcf.message.settings.enableBBCodes{/lang}</label>
-							<label><input id="signatureEnableHtml" name="signatureEnableHtml" type="checkbox" value="1"{if $signatureEnableHtml} checked="checked"{/if}> {lang}wcf.message.settings.enableHtml{/lang}</label>
+							<label><input id="signatureEnableSmilies" name="signatureEnableSmilies" type="checkbox" value="1"{if $signatureEnableSmilies} checked{/if}> {lang}wcf.message.settings.enableSmilies{/lang}</label>
+							<label><input id="signatureEnableBBCodes" name="signatureEnableBBCodes" type="checkbox" value="1"{if $signatureEnableBBCodes} checked{/if}> {lang}wcf.message.settings.enableBBCodes{/lang}</label>
+							<label><input id="signatureEnableHtml" name="signatureEnableHtml" type="checkbox" value="1"{if $signatureEnableHtml} checked{/if}> {lang}wcf.message.settings.enableHtml{/lang}</label>
 						</dd>
 					</dl>
 					
@@ -317,7 +317,7 @@
 						<dl>
 							<dt></dt>
 							<dd>
-								<label><input type="checkbox" id="disableSignature" name="disableSignature" value="1"{if $disableSignature == 1} checked="checked"{/if}> {lang}wcf.acp.user.disableSignature{/lang}</label>
+								<label><input type="checkbox" id="disableSignature" name="disableSignature" value="1"{if $disableSignature == 1} checked{/if}> {lang}wcf.acp.user.disableSignature{/lang}</label>
 							</dd>
 						</dl>
 						
@@ -330,7 +330,7 @@
 						
 						<dl>
 							<dt></dt>
-							<dd><label><input type="checkbox" id="disableSignatureNeverExpires" name="disableSignatureNeverExpires" value="1"{if !$disableSignatureExpires} checked="checked"{/if}> {lang}wcf.acp.user.disableSignature.neverExpires{/lang}</label></dd>
+							<dd><label><input type="checkbox" id="disableSignatureNeverExpires" name="disableSignatureNeverExpires" value="1"{if !$disableSignatureExpires} checked{/if}> {lang}wcf.acp.user.disableSignature.neverExpires{/lang}</label></dd>
 						</dl>
 						
 						<dl id="disableSignatureExpiresSetting">
@@ -387,7 +387,7 @@
 					<dl>
 						<dt></dt>
 						<dd>
-							<label><input type="radio" name="avatarType" value="none"{if $avatarType == 'none'} checked="checked"{/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
+							<label><input type="radio" name="avatarType" value="none"{if $avatarType == 'none'} checked{/if}> {lang}wcf.user.avatar.type.none{/lang}</label>
 						</dd>
 					</dl>
 					
@@ -407,7 +407,7 @@
 							{/if}
 						</dt>
 						<dd>
-							<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked="checked"{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
+							<label><input type="radio" name="avatarType" value="custom"{if $avatarType == 'custom'} checked{/if}> {lang}wcf.user.avatar.type.custom{/lang}</label>
 							
 							{* placeholder for upload button: *}
 							<div></div>
@@ -424,7 +424,7 @@
 						<dl{if $errorType[gravatar]|isset} class="formError"{/if}>
 							<dt><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96"></dt>
 							<dd>
-								<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked="checked"{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
+								<label><input type="radio" name="avatarType" value="gravatar"{if $avatarType == 'gravatar'} checked{/if}> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
 								
 								{if $errorType[gravatar]|isset}
 									<small class="innerError">
@@ -445,7 +445,7 @@
 						<dl>
 							<dt></dt>
 							<dd>
-								<label><input type="checkbox" id="disableAvatar" name="disableAvatar" value="1"{if $disableAvatar == 1} checked="checked"{/if}> {lang}wcf.acp.user.disableAvatar{/lang}</label>
+								<label><input type="checkbox" id="disableAvatar" name="disableAvatar" value="1"{if $disableAvatar == 1} checked{/if}> {lang}wcf.acp.user.disableAvatar{/lang}</label>
 							</dd>
 						</dl>
 						
@@ -458,7 +458,7 @@
 						
 						<dl>
 							<dt></dt>
-							<dd><label><input type="checkbox" id="disableAvatarNeverExpires" name="disableAvatarNeverExpires" value="1"{if !$disableAvatarExpires} checked="checked"{/if}> {lang}wcf.acp.user.disableAvatar.neverExpires{/lang}</label></dd>
+							<dd><label><input type="checkbox" id="disableAvatarNeverExpires" name="disableAvatarNeverExpires" value="1"{if !$disableAvatarExpires} checked{/if}> {lang}wcf.acp.user.disableAvatar.neverExpires{/lang}</label></dd>
 						</dl>
 						
 						<dl id="disableAvatarExpiresSetting">
diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 5ea88965b7..8098a27908 100644
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -41,8 +41,8 @@
 		<dl>
 			<dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
 			<dd>
-				<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-				<label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+				<label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+				<label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]"> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index e6b915f711..8b3042045c 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -72,7 +72,7 @@
 		<dl{if $errorType.groupName|isset} class="formError"{/if}>
 			<dt><label for="groupName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="medium">
+				<input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus class="medium">
 				{if $errorType.groupName|isset}
 					<small class="innerError">
 						{if $errorType.groupName == 'empty'}
@@ -135,7 +135,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1"{if $showOnTeamPage} checked="checked"{/if}> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
+					<label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1"{if $showOnTeamPage} checked{/if}> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
 				</dd>
 			</dl>
 		{/if}
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index c291d2dcea..d9df0af3f4 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -63,7 +63,7 @@
 		<dl class="formError">
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if}> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
+				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked{/if}> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
index 15f87ef818..ccb11efc5a 100644
--- a/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupBooleanOptionType.tpl
@@ -1,15 +1,15 @@
 <ol class="flexibleButtonGroup">
 	<li>
-		<input type="radio" id="{$option->optionName}"{if $value == 1} checked="checked"{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
 	</li>
 	<li>
-		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked="checked"{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+		<input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 		<label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
 	</li>
 	{if $group === null || !$group->isEveryone()}
 		<li>
-			<input type="radio" id="{$option->optionName}_never"{if $value == -1} checked="checked"{/if} name="values[{$option->optionName}]" value="-1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
+			<input type="radio" id="{$option->optionName}_never"{if $value == -1} checked{/if} name="values[{$option->optionName}]" value="-1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
 			<label for="{$option->optionName}_never" class="yellow"><span class="icon icon16 fa-ban"></span> {lang}wcf.acp.option.type.boolean.never{/lang}</label>
 		</li>
 	{/if}
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 6299bd6013..206764aec8 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -81,7 +81,7 @@
 		<dl{if $errorField == 'subject'} class="formError"{/if}>
 			<dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
 			<dd>
-				<input type="text" id="subject" name="subject" value="{$subject}" autofocus="autofocus" class="long">
+				<input type="text" id="subject" name="subject" value="{$subject}" autofocus class="long">
 				{if $errorField == 'subject'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -131,7 +131,7 @@
 		<dl>
 			<dt></dt>
 			<dd>
-				<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1"> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+				<label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked {/if}value="1"> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
 			</dd>
 		</dl>
 		
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index a729931129..cd180d3a72 100644
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -27,7 +27,7 @@
 			<dl{if $errorField == 'optionName'} class="formError"{/if}>
 				<dt><label for="optionName">{lang}wcf.global.name{/lang}</label></dt>
 				<dd>
-					<input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required="required" autofocus="autofocus" class="long">
+					<input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required autofocus class="long">
 					{if $errorField == 'optionName'}
 						<small class="innerError">
 							{if $errorType == 'multilingual'}
@@ -67,7 +67,7 @@
 				<dd>
 					<select name="categoryName" id="categoryName">
 						{foreach from=$availableCategories item=availableCategory}
-							<option value="{$availableCategory->categoryName}"{if $availableCategory->categoryName == $categoryName} selected="selected"{/if}>{lang}wcf.user.option.category.{$availableCategory->categoryName}{/lang}</option>
+							<option value="{$availableCategory->categoryName}"{if $availableCategory->categoryName == $categoryName} selected{/if}>{lang}wcf.user.option.category.{$availableCategory->categoryName}{/lang}</option>
 						{/foreach}
 					</select>
 					
@@ -101,7 +101,7 @@
 				<dd>
 					<select name="optionType" id="optionType">
 						{foreach from=$availableOptionTypes item=availableOptionType}
-							<option value="{$availableOptionType}"{if $availableOptionType == $optionType} selected="selected"{/if}>{$availableOptionType}</option>
+							<option value="{$availableOptionType}"{if $availableOptionType == $optionType} selected{/if}>{$availableOptionType}</option>
 						{/foreach}
 					</select>
 					{if $errorField == 'optionType'}
@@ -169,10 +169,10 @@
 				<dt><label for="editable">{lang}wcf.acp.user.option.editable{/lang}</label></dt>
 				<dd>
 					<select name="editable" id="editable">
-						<option value="1"{if $editable == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.1{/lang}</option>
-						<option value="2"{if $editable == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.2{/lang}</option>
-						<option value="3"{if $editable == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.3{/lang}</option>
-						<option value="6"{if $editable == 6} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.6{/lang}</option>
+						<option value="1"{if $editable == 1} selected{/if}>{lang}wcf.acp.user.option.editable.1{/lang}</option>
+						<option value="2"{if $editable == 2} selected{/if}>{lang}wcf.acp.user.option.editable.2{/lang}</option>
+						<option value="3"{if $editable == 3} selected{/if}>{lang}wcf.acp.user.option.editable.3{/lang}</option>
+						<option value="6"{if $editable == 6} selected{/if}>{lang}wcf.acp.user.option.editable.6{/lang}</option>
 					</select>
 				</dd>
 			</dl>
@@ -181,12 +181,12 @@
 				<dt><label for="visible">{lang}wcf.acp.user.option.visible{/lang}</label></dt>
 				<dd>
 					<select name="visible" id="visible">
-						<option value="0"{if $visible == 0} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.0{/lang}</option>
-						<option value="1"{if $visible == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.1{/lang}</option>
-						<option value="2"{if $visible == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.2{/lang}</option>
-						<option value="3"{if $visible == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.3{/lang}</option>
-						<option value="7"{if $visible == 7} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.7{/lang}</option>
-						<option value="15"{if $visible == 15} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.15{/lang}</option>
+						<option value="0"{if $visible == 0} selected{/if}>{lang}wcf.acp.user.option.visible.0{/lang}</option>
+						<option value="1"{if $visible == 1} selected{/if}>{lang}wcf.acp.user.option.visible.1{/lang}</option>
+						<option value="2"{if $visible == 2} selected{/if}>{lang}wcf.acp.user.option.visible.2{/lang}</option>
+						<option value="3"{if $visible == 3} selected{/if}>{lang}wcf.acp.user.option.visible.3{/lang}</option>
+						<option value="7"{if $visible == 7} selected{/if}>{lang}wcf.acp.user.option.visible.7{/lang}</option>
+						<option value="15"{if $visible == 15} selected{/if}>{lang}wcf.acp.user.option.visible.15{/lang}</option>
 					</select>
 				</dd>
 			</dl>
@@ -211,9 +211,9 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="required" id="required" value="1"{if $required == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.required{/lang}</label>
-					<label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1"{if $askDuringRegistration == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
-					<label><input type="checkbox" name="searchable" id="searchable" value="1"{if $searchable == 1} checked="checked"{/if}> {lang}wcf.acp.user.option.searchable{/lang}</label>
+					<label><input type="checkbox" name="required" id="required" value="1"{if $required == 1} checked{/if}> {lang}wcf.acp.user.option.required{/lang}</label>
+					<label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1"{if $askDuringRegistration == 1} checked{/if}> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
+					<label><input type="checkbox" name="searchable" id="searchable" value="1"{if $searchable == 1} checked{/if}> {lang}wcf.acp.user.option.searchable{/lang}</label>
 				</dd>
 			</dl>
 			
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index e800236e57..64345b297e 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -26,7 +26,7 @@
 		<dl{if $errorField == 'categoryName'} class="formError"{/if}>
 			<dt><label for="categoryName">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
-				<input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required autofocus class="long">
 				{if $errorField == 'categoryName'}
 					<small class="innerError">
 						{if $errorType == 'multilingual'}
diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
index be2980da05..fadc3fefe8 100644
--- a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -26,7 +26,7 @@
 			<dl>
 				<dt></dt>
 				<dd>
-					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked="checked"{/if}> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
+					<label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked{/if}> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
 					<small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>	
 				</dd>
 			</dl>
diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index c6ed4194e2..9225de04d7 100644
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -33,7 +33,7 @@
 		<dl{if $errorField == 'rankTitle'} class="formError"{/if}>
 			<dt><label for="rankTitle">{lang}wcf.acp.user.rank.title{/lang}</label></dt>
 			<dd>
-				<input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required="required" autofocus="autofocus" class="long">
+				<input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required autofocus class="long">
 				{if $errorField == 'rankTitle'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -55,9 +55,9 @@
 				<ul id="labelList">
 					{foreach from=$availableCssClassNames item=className}
 						{if $className == 'custom'}
-							<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
+							<li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long"></span></li>
 						{else}
-							<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
+							<li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked{/if}> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
 						{/if}
 					{/foreach}
 				</ul>
@@ -125,7 +125,7 @@
 			<dd>
 				<select id="groupID" name="groupID">
 					{foreach from=$availableGroups item=group}
-						<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group->groupName|language}</option>
+						<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group->groupName|language}</option>
 					{/foreach}
 				</select>
 				{if $errorField == 'groupID'}
@@ -146,8 +146,8 @@
 			<dd>
 				<select id="requiredGender" name="requiredGender">
 					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
-					<option value="1"{if $requiredGender == 1} selected="selected"{/if}>{lang}wcf.user.gender.male{/lang}</option>
-					<option value="2"{if $requiredGender == 2} selected="selected"{/if}>{lang}wcf.user.gender.female{/lang}</option>
+					<option value="1"{if $requiredGender == 1} selected{/if}>{lang}wcf.user.gender.male{/lang}</option>
+					<option value="2"{if $requiredGender == 2} selected{/if}>{lang}wcf.user.gender.female{/lang}</option>
 				</select>
 				{if $errorField == 'requiredGender'}
 					<small class="innerError">
diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index c93e672393..f61ed4399e 100644
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -56,17 +56,17 @@
 				<dt><label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label></dt>
 				<dd>
 					<select id="sortField" name="sortField">
-						<option value="userID"{if $sortField == 'userID'} selected="selected"{/if}>{lang}wcf.user.userID{/lang}</option>
-						<option value="username"{if $sortField == 'username'} selected="selected"{/if}>{lang}wcf.user.username{/lang}</option>
-						<option value="email"{if $sortField == 'email'} selected="selected"{/if}>{lang}wcf.user.email{/lang}</option>
-						<option value="registrationDate"{if $sortField == 'registrationDate'} selected="selected"{/if}>{lang}wcf.user.registrationDate{/lang}</option>
+						<option value="userID"{if $sortField == 'userID'} selected{/if}>{lang}wcf.user.userID{/lang}</option>
+						<option value="username"{if $sortField == 'username'} selected{/if}>{lang}wcf.user.username{/lang}</option>
+						<option value="email"{if $sortField == 'email'} selected{/if}>{lang}wcf.user.email{/lang}</option>
+						<option value="registrationDate"{if $sortField == 'registrationDate'} selected{/if}>{lang}wcf.user.registrationDate{/lang}</option>
 						
 						{if $additionalSortFields|isset}{@$additionalSortFields}{/if}
 					</select>
 					
 					<select id="sortOrder" name="sortOrder">
-						<option value="ASC"{if $sortOrder == 'ASC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
-						<option value="DESC"{if $sortOrder == 'DESC'} selected="selected"{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
+						<option value="ASC"{if $sortOrder == 'ASC'} selected{/if}>{lang}wcf.global.sortOrder.ascending{/lang}</option>
+						<option value="DESC"{if $sortOrder == 'DESC'} selected{/if}>{lang}wcf.global.sortOrder.descending{/lang}</option>
 					</select>
 				</dd>
 			</dl>
@@ -92,7 +92,7 @@
 					<dd>
 						{foreach from=$columnOptions item=optionData}
 							{assign var='option' value=$optionData.object}
-							<label><input type="checkbox" name="columns[]" value="{$option->optionName}"{if $option->optionName|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
+							<label><input type="checkbox" name="columns[]" value="{$option->optionName}"{if $option->optionName|in_array:$columns} checked{/if}> {lang}wcf.user.option.{$option->optionName}{/lang}</label>
 						{/foreach}
 					</dd>
 				</dl>
@@ -102,14 +102,14 @@
 				<dt><label>{lang}wcf.acp.user.search.display.columns.other{/lang}</label></dt>
 				<dd>
 					{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-						<label><input type="checkbox" name="columns[]" value="email"{if "email"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.email{/lang}</label>
+						<label><input type="checkbox" name="columns[]" value="email"{if "email"|in_array:$columns} checked{/if}> {lang}wcf.user.email{/lang}</label>
 					{/if}
-					<label><input type="checkbox" name="columns[]" value="registrationDate"{if "registrationDate"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.registrationDate{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="lastActivityTime"{if "lastActivityTime"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.lastActivityTime{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="profileHits"{if "profileHits"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.profileHits{/lang}</label>
-					<label><input type="checkbox" name="columns[]" value="activityPoints"{if "activityPoints"|in_array:$columns} checked="checked"{/if}> {lang}wcf.user.activityPoint{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="registrationDate"{if "registrationDate"|in_array:$columns} checked{/if}> {lang}wcf.user.registrationDate{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="lastActivityTime"{if "lastActivityTime"|in_array:$columns} checked{/if}> {lang}wcf.user.lastActivityTime{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="profileHits"{if "profileHits"|in_array:$columns} checked{/if}> {lang}wcf.user.profileHits{/lang}</label>
+					<label><input type="checkbox" name="columns[]" value="activityPoints"{if "activityPoints"|in_array:$columns} checked{/if}> {lang}wcf.user.activityPoint{/lang}</label>
 					{if MODULE_LIKE}
-						<label><input type="checkbox" name="columns[]" value="likesReceived"{if "likesReceived"|in_array:$columns} checked="checked"{/if}> {lang}wcf.like.likesReceived{/lang}</label>
+						<label><input type="checkbox" name="columns[]" value="likesReceived"{if "likesReceived"|in_array:$columns} checked{/if}> {lang}wcf.like.likesReceived{/lang}</label>
 					{/if}
 					{event name='searchDisplayColumns'}
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
index 3bd597c367..07213a4af3 100644
--- a/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/useroptionsOptionType.tpl
@@ -23,7 +23,7 @@
 			{foreach from=$availableOptions item=availableOption}
 				<li class="sortableNode">
 					<span class="sortableNodeLabel">
-						<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked="checked"{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
+						<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
 					</span>
 				</li>
 			{/foreach}
@@ -31,6 +31,6 @@
 	</div>
 {else}
 	{foreach from=$availableOptions item=availableOption}
-		<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked="checked"{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
+		<label><input type="checkbox" name="values[{$option->optionName}][]" value="{$availableOption}"{if $availableOption|in_array:$value} checked{/if}> {lang}wcf.user.option.{$availableOption}{/lang}</label>
 	{/foreach}
 {/if}
\ No newline at end of file
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index c3772e0262..eba29f3a59 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -2168,15 +2168,15 @@ WCF.Message.Share.Content = Class.extend({
 			
 			// permalink (plain text)
 			var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalink">' + WCF.Language.get('wcf.message.share.permalink') + '</label></h2></section>').appendTo(this._dialog);
-			$('<input type="text" id="__sharePermalink" class="long" readonly="readonly" />').attr('value', $link).appendTo($fieldset);
+			$('<input type="text" id="__sharePermalink" class="long" readonly />').attr('value', $link).appendTo($fieldset);
 			
 			// permalink (BBCode)
 			var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalinkBBCode">' + WCF.Language.get('wcf.message.share.permalink.bbcode') + '</label></h2></section>').appendTo(this._dialog);
-			$('<input type="text" id="__sharePermalinkBBCode" class="long" readonly="readonly" />').attr('value', '[url=\'' + $link + '\']' + $title + '[/url]').appendTo($fieldset);
+			$('<input type="text" id="__sharePermalinkBBCode" class="long" readonly />').attr('value', '[url=\'' + $link + '\']' + $title + '[/url]').appendTo($fieldset);
 			
 			// permalink (HTML)
 			var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalinkHTML">' + WCF.Language.get('wcf.message.share.permalink.html') + '</label></h2></section>').appendTo(this._dialog);
-			$('<input type="text" id="__sharePermalinkHTML" class="long" readonly="readonly" />').attr('value', '<a href="' + $link + '">' + WCF.String.escapeHTML($title) + '</a>').appendTo($fieldset);
+			$('<input type="text" id="__sharePermalinkHTML" class="long" readonly />').attr('value', '<a href="' + $link + '">' + WCF.String.escapeHTML($title) + '</a>').appendTo($fieldset);
 			
 			this._cache[$key] = this._dialog.html();
 			
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index cd31ce3491..ccf0ae4bdc 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -3127,7 +3127,7 @@ WCF.User.InlineEditor = WCF.InlineEditor.extend({
 		
 		// create dialog
 		this._dialog = $('<div />').hide().appendTo(document.body);
-		this._dialog.append($('<div class="section"><dl><dt><label for="' + optionName + 'Reason">' + WCF.Language.get('wcf.global.reason') + '</label></dt><dd><textarea id="' + optionName + 'Reason" cols="40" rows="3" />' + (WCF.Language.get('wcf.user.' + optionName + '.reason.description') != 'wcf.user.' + optionName + '.reason.description' ? '<small>' + WCF.Language.get('wcf.user.' + optionName + '.reason.description') + '</small>' : '') + '</dd></dl><dl><dt></dt><dd><label for="' + optionName + 'NeverExpires"><input type="checkbox" name="' + optionName + 'NeverExpires" id="' + optionName + 'NeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.user.' + optionName + '.neverExpires') + '</label></dd></dl><dl id="' + optionName + 'ExpiresSettings" style="display: none;"><dt><label for="' + optionName + 'Expires">' + WCF.Language.get('wcf.user.' + optionName + '.expires') + '</label></dt><dd><input type="date" name="' + optionName + 'Expires" id="' + optionName + 'Expires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.user.' + optionName + '.expires.description') + '</small></dd></dl></div>'));
+		this._dialog.append($('<div class="section"><dl><dt><label for="' + optionName + 'Reason">' + WCF.Language.get('wcf.global.reason') + '</label></dt><dd><textarea id="' + optionName + 'Reason" cols="40" rows="3" />' + (WCF.Language.get('wcf.user.' + optionName + '.reason.description') != 'wcf.user.' + optionName + '.reason.description' ? '<small>' + WCF.Language.get('wcf.user.' + optionName + '.reason.description') + '</small>' : '') + '</dd></dl><dl><dt></dt><dd><label for="' + optionName + 'NeverExpires"><input type="checkbox" name="' + optionName + 'NeverExpires" id="' + optionName + 'NeverExpires" checked> ' + WCF.Language.get('wcf.user.' + optionName + '.neverExpires') + '</label></dd></dl><dl id="' + optionName + 'ExpiresSettings" style="display: none;"><dt><label for="' + optionName + 'Expires">' + WCF.Language.get('wcf.user.' + optionName + '.expires') + '</label></dt><dd><input type="date" name="' + optionName + 'Expires" id="' + optionName + 'Expires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.user.' + optionName + '.expires.description') + '</small></dd></dl></div>'));
 		this._dialog.append($('<div class="formSubmit"><button class="buttonPrimary" accesskey="s">' + WCF.Language.get('wcf.global.button.submit') + '</button></div>'));
 		
 		this._dialog.data('optionName', optionName).data('userID', userID);
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
index dd9fbf8f0d..cb7a36722f 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractCheckboxCondition.class.php
@@ -54,7 +54,7 @@ abstract class AbstractCheckboxCondition extends AbstractSingleFieldCondition {
 	 * @inheritDoc
 	 */
 	public function getFieldElement() {
-		return '<label><input type="checkbox" name="' . $this->fieldName . '" id="' . $this->fieldName . '"'.($this->fieldValue ? ' checked="checked"' : '').'> '.WCF::getLanguage()->get($this->label).'</label>';
+		return '<label><input type="checkbox" name="' . $this->fieldName . '" id="' . $this->fieldName . '"'.($this->fieldValue ? ' checked' : '').'> '.WCF::getLanguage()->get($this->label).'</label>';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractMultiCategoryCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractMultiCategoryCondition.class.php
index de233f15c9..397ac885a5 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractMultiCategoryCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractMultiCategoryCondition.class.php
@@ -34,10 +34,10 @@ abstract class AbstractMultiCategoryCondition extends AbstractMultiSelectConditi
 		$categoryTree = (new $this->nodeTreeClassname($this->objectType))->getIterator();
 		$categoryCount = iterator_count($categoryTree);
 		
-		$fieldElement = '<select name="'.$this->fieldName.'[]" id="'.$this->fieldName.'" multiple="multiple" size="'.($categoryCount >= 10 ? 10 : $categoryCount).'">';
+		$fieldElement = '<select name="'.$this->fieldName.'[]" id="'.$this->fieldName.'" multiple size="'.($categoryCount >= 10 ? 10 : $categoryCount).'">';
 		/** @var CategoryNode $categoryNode */
 		foreach ($categoryTree as $categoryNode) {
-			$fieldElement .= "<option value=\"{$categoryNode->categoryID}\"".(in_array($categoryNode->categoryID, $this->fieldValue) ? ' selected="selected"' : '').">".str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;", $categoryNode->getOpenParentNodes()).$categoryNode->getTitle()."</option>";
+			$fieldElement .= "<option value=\"{$categoryNode->categoryID}\"".(in_array($categoryNode->categoryID, $this->fieldValue) ? ' selected' : '').">".str_repeat("&nbsp;&nbsp;&nbsp;&nbsp;", $categoryNode->getOpenParentNodes()).$categoryNode->getTitle()."</option>";
 		}
 		$fieldElement .= '</select>';
 		
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
index d4be98be44..608f704e82 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractMultiSelectCondition.class.php
@@ -36,7 +36,7 @@ abstract class AbstractMultiSelectCondition extends AbstractSelectCondition {
 	protected function getFieldElement() {
 		$options = $this->getOptions();
 		
-		$fieldElement = '<select name="'.$this->fieldName.'[]" id="'.$this->fieldName.'" multiple="multiple" size="'.(count($options, COUNT_RECURSIVE) > 10 ? 10 : count($options)).'">';
+		$fieldElement = '<select name="'.$this->fieldName.'[]" id="'.$this->fieldName.'" multiple size="'.(count($options, COUNT_RECURSIVE) > 10 ? 10 : count($options)).'">';
 		foreach ($options as $key => $value) {
 			if (is_array($value)) {
 				$fieldElement .= $this->getOptGroupCode($key, $value);
@@ -54,7 +54,7 @@ abstract class AbstractMultiSelectCondition extends AbstractSelectCondition {
 	 * @inheritDoc
 	 */
 	protected function getOptionCode($value, $label) {
-		return '<option value="'.$value.'"'.(in_array($value, $this->fieldValue) ? ' selected="selected"' : '').'>'.WCF::getLanguage()->get($label).'</option>';
+		return '<option value="'.$value.'"'.(in_array($value, $this->fieldValue) ? ' selected' : '').'>'.WCF::getLanguage()->get($label).'</option>';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/condition/AbstractSelectCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractSelectCondition.class.php
index c265d47764..d4adf31ef1 100644
--- a/wcfsetup/install/files/lib/system/condition/AbstractSelectCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/AbstractSelectCondition.class.php
@@ -96,7 +96,7 @@ abstract class AbstractSelectCondition extends AbstractSingleFieldCondition {
 	 * @return	string
 	 */
 	protected function getOptionCode($value, $label) {
-		return '<option value="'.$value.'"'.($this->fieldValue == $value ? ' selected="selected"' : '').'>'.WCF::getLanguage()->get($label).'</option>';
+		return '<option value="'.$value.'"'.($this->fieldValue == $value ? ' selected' : '').'>'.WCF::getLanguage()->get($label).'</option>';
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
index e455a8c6c7..0f7f6cc770 100644
--- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
@@ -99,9 +99,9 @@ HTML;
 	 * @return	string
 	 */
 	protected function getTimezoneFieldElement() {
-		$fieldElement = '<select name="timezone" id="timezone"><option value="0"'.($this->timezone ? ' selected="selected"' : '').'>'.WCF::getLanguage()->get('wcf.date.timezone.user').'</option>';
+		$fieldElement = '<select name="timezone" id="timezone"><option value="0"'.($this->timezone ? ' selected' : '').'>'.WCF::getLanguage()->get('wcf.date.timezone.user').'</option>';
 		foreach (DateUtil::getAvailableTimezones() as $timezone) {
-			$fieldElement .= '<option value="'.$timezone.'"'.($this->timezone === $timezone ? ' selected="selected"' : '').'>'.WCF::getLanguage()->get('wcf.date.timezone.'.str_replace('/', '.', strtolower($timezone))).'</option>';
+			$fieldElement .= '<option value="'.$timezone.'"'.($this->timezone === $timezone ? ' selected' : '').'>'.WCF::getLanguage()->get('wcf.date.timezone.'.str_replace('/', '.', strtolower($timezone))).'</option>';
 		}
 		$fieldElement .= '</select>';
 		
diff --git a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
index 6dcfb4a469..15735a9c4e 100644
--- a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
@@ -37,7 +37,7 @@ class UserBirthdayCondition extends AbstractCondition implements IContentConditi
 		$label = WCF::getLanguage()->get('wcf.user.birthdayToday');
 		$checked = '';
 		if ($this->birthdayToday) {
-			$checked = ' checked="checked"';
+			$checked = ' checked';
 		}
 		
 		return <<<HTML
diff --git a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
index d6681a2ce6..8f11a7509a 100644
--- a/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserGroupCondition.class.php
@@ -143,7 +143,7 @@ HTML;
 		$returnValue = "";
 		foreach ($userGroups as $userGroup) {
 			/** @noinspection PhpVariableVariableInspection */
-			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$userGroup->groupID."\"".(in_array($userGroup->groupID, $this->$identifier) ? ' checked="checked"' : "")."> ".$userGroup->getName()."</label>";
+			$returnValue .= "<label><input type=\"checkbox\" name=\"".$identifier."[]\" value=\"".$userGroup->groupID."\"".(in_array($userGroup->groupID, $this->$identifier) ? ' checked' : "")."> ".$userGroup->getName()."</label>";
 		}
 		
 		return $returnValue;
diff --git a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
index 302c2c0083..ae5e7bdc4e 100644
--- a/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserLanguageCondition.class.php
@@ -72,7 +72,7 @@ class UserLanguageCondition extends AbstractSingleFieldCondition implements ICon
 	protected function getFieldElement() {
 		$returnValue = "";
 		foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
-			$returnValue .= "<label><input type=\"checkbox\" name=\"languageIDs[]\" value=\"".$language->languageID."\"".(in_array($language->languageID, $this->languageIDs) ? ' checked="checked"' : "")."> ".$language->languageName."</label>";
+			$returnValue .= "<label><input type=\"checkbox\" name=\"languageIDs[]\" value=\"".$language->languageID."\"".(in_array($language->languageID, $this->languageIDs) ? ' checked' : "")."> ".$language->languageName."</label>";
 		}
 		
 		return $returnValue;
diff --git a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
index 50dfd26fb9..3f419daf2a 100644
--- a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
@@ -54,12 +54,12 @@ class UserMobileBrowserCondition extends AbstractSingleFieldCondition implements
 		$usesNoMobileBrowserLabel = WCF::getLanguage()->get('wcf.user.condition.mobileBrowser.usesNoMobileBrowser');
 		$usesMobileBrowserChecked = '';
 		if ($this->usesMobileBrowser) {
-			$usesMobileBrowserChecked = ' checked="checked"';
+			$usesMobileBrowserChecked = ' checked';
 		}
 		
 		$usesNoMobileBrowserChecked = '';
 		if ($this->usesNoMobileBrowser) {
-			$usesNoMobileBrowserChecked = ' checked="checked"';
+			$usesNoMobileBrowserChecked = ' checked';
 		}
 		
 		return <<<HTML
diff --git a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
index 728ba61b67..b812caa99f 100644
--- a/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserStateCondition.class.php
@@ -124,7 +124,7 @@ class UserStateCondition extends AbstractSingleFieldCondition implements IConten
 	protected function getCheckedAttribute($propertyName) {
 		/** @noinspection PhpVariableVariableInspection */
 		if ($this->$propertyName) {
-			return ' checked="checked"';
+			return ' checked';
 		}
 		
 		return '';
diff --git a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
index ce7ff6b97e..7a9e35a19a 100644
--- a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
@@ -45,7 +45,7 @@ class MultiPageCondition extends AbstractMultiSelectCondition implements IConten
 			}
 			$fieldElement .= '><label><input type="checkbox" name="'.$this->fieldName.'[]" value="'.$pageNode->pageID.'"';
 			if (in_array($pageNode->pageID, $this->fieldValue)) {
-				$fieldElement .= ' checked="checked"';
+				$fieldElement .= ' checked';
 			}
 			$fieldElement .= '> '.$pageNode->name.'</label></li>';
 		}
diff --git a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
index 017d42707c..aedd38270b 100644
--- a/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
+++ b/wcfsetup/install/files/lib/system/form/element/MultipleSelectionFormElement.class.php
@@ -55,7 +55,7 @@ class MultipleSelectionFormElement extends AbstractNamedFormElement {
 	public function getHTML($formName) {
 		$disabled = '';
 		if ($this->disabledMessage) {
-			$disabled = ' disabled="disabled"';
+			$disabled = ' disabled';
 		}
 		
 		return <<<HTML
diff --git a/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php b/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php
index e288783831..487c01872f 100644
--- a/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/group/UserGroupsUserGroupOptionType.class.php
@@ -29,7 +29,7 @@ class UserGroupsUserGroupOptionType extends AbstractOptionType implements IUserG
 		// generate html
 		$html = '';
 		foreach ($groups as $group) {
-			$html .= '<label><input type="checkbox" name="values['.StringUtil::encodeHTML($option->optionName).'][]" value="'.$group->groupID.'" '.(in_array($group->groupID, $selectedGroups) ? 'checked="checked" ' : '').'/> '.$group->getName().'</label>';
+			$html .= '<label><input type="checkbox" name="values['.StringUtil::encodeHTML($option->optionName).'][]" value="'.$group->groupID.'"'.(in_array($group->groupID, $selectedGroups) ? ' checked' : '').'> '.$group->getName().'</label>';
 		}
 		
 		return $html;
diff --git a/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
index 060fced2ff..b60797421a 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/HtmlCheckboxesFunctionTemplatePlugin.class.php
@@ -69,7 +69,7 @@ class HtmlCheckboxesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
 		$html = '';
 		foreach ($tagArgs['options'] as $key => $value) {
 			if (!empty($html)) $html .= $tagArgs['separator'];
-			$html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked="checked"' : '').'> '.$this->encodeHTML($value).'</label>';
+			$html .= '<label><input type="checkbox" name="'.$this->encodeHTML($tagArgs['name']).'[]" value="'.$this->encodeHTML($key).'"'.(in_array($key, $tagArgs['selected']) ? ' checked' : '').'> '.$this->encodeHTML($value).'</label>';
 		}
 		
 		return $html;
diff --git a/wcfsetup/install/files/lib/system/template/plugin/HtmlOptionsFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/HtmlOptionsFunctionTemplatePlugin.class.php
index 617b6b6aab..d5c88bac5b 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/HtmlOptionsFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/HtmlOptionsFunctionTemplatePlugin.class.php
@@ -137,6 +137,6 @@ class HtmlOptionsFunctionTemplatePlugin extends HtmlCheckboxesFunctionTemplatePl
 	 */
 	protected function makeOption($key, $value) {
 		$value = $this->encodeHTML($value);
-		return '<option label="'.$value.'" value="'.$this->encodeHTML($key).'"'.(in_array($key, $this->selected) ? ' selected="selected"' : '').'>'.$value."</option>\n";
+		return '<option label="'.$value.'" value="'.$this->encodeHTML($key).'"'.(in_array($key, $this->selected) ? ' selected' : '').'>'.$value."</option>\n";
 	}
 }
diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl
index a413703a2f..6f2c1f71a9 100644
--- a/wcfsetup/setup/template/stepConfigureDB.tpl
+++ b/wcfsetup/setup/template/stepConfigureDB.tpl
@@ -17,12 +17,12 @@
 	
 		<dl>
 			<dt><label for="dbHost">{lang}wcf.global.configureDB.host{/lang}</label></dt>
-			<dd><input type="text" id="dbHost" name="dbHost" value="{$dbHost}" required="required" class="long"></dd>
+			<dd><input type="text" id="dbHost" name="dbHost" value="{$dbHost}" required class="long"></dd>
 		</dl>
 		
 		<dl>
 			<dt><label for="dbUser">{lang}wcf.global.configureDB.user{/lang}</label></dt>
-			<dd><input type="text" id="dbUser" name="dbUser" value="{$dbUser}" required="required" class="medium"></dd>
+			<dd><input type="text" id="dbUser" name="dbUser" value="{$dbUser}" required class="medium"></dd>
 		</dl>
 		
 		<dl>
@@ -33,7 +33,7 @@
 		<dl>
 			<dt><label for="dbName">{lang}wcf.global.configureDB.database{/lang}</label></dt>
 			<dd>
-				<input type="text" id="dbName" name="dbName" value="{$dbName}" required="required" class="medium">
+				<input type="text" id="dbName" name="dbName" value="{$dbName}" required class="medium">
 				<small>{lang}wcf.global.configureDB.database.description{/lang}</small>
 			</dd>
 		</dl>
@@ -41,7 +41,7 @@
 		<dl>
 			<dt><label for="dbNumber">{lang}wcf.global.configureDB.number{/lang}</label></dt>
 			<dd>
-				<input type="number" id="dbNumber" name="dbNumber" value="{$dbNumber}" required="required" min="1" class="short">
+				<input type="number" id="dbNumber" name="dbNumber" value="{$dbNumber}" required min="1" class="short">
 				<small>{lang}wcf.global.configureDB.number.description{/lang}</small>
 			</dd>
 		</dl>
diff --git a/wcfsetup/setup/template/stepCreateUser.tpl b/wcfsetup/setup/template/stepCreateUser.tpl
index b575658d60..5a7e8a789c 100644
--- a/wcfsetup/setup/template/stepCreateUser.tpl
+++ b/wcfsetup/setup/template/stepCreateUser.tpl
@@ -14,7 +14,7 @@
 		<dl{if $errorField == 'username'} class="formError"{/if}>
 			<dt><label for="username">{lang}wcf.global.createUser.username{/lang}</label></dt>
 			<dd>
-				<input type="text" id="username" name="username" value="{$username}" required="required" class="medium">
+				<input type="text" id="username" name="username" value="{$username}" required class="medium">
 				{if $errorField == 'username'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -27,7 +27,7 @@
 		<dl{if $errorField == 'email'} class="formError"{/if}>
 			<dt><label for="email">{lang}wcf.global.createUser.email{/lang}</label></dt>
 			<dd>
-				<input type="email" id="email" name="email" value="{$email}" required="required" class="medium">
+				<input type="email" id="email" name="email" value="{$email}" required class="medium">
 				{if $errorField == 'email'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -40,7 +40,7 @@
 		<dl{if $errorField == 'confirmEmail'} class="formError"{/if}>
 			<dt><label for="confirmEmail">{lang}wcf.global.createUser.confirmEmail{/lang}</label></dt>
 			<dd>
-				<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required="required" class="medium">
+				<input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" required class="medium">
 				{if $errorField == 'confirmEmail'}
 					<small class="innerError">
 						{if $errorType == 'notEqual'}{lang}wcf.global.createUser.error.confirmEmail.notEqual{/lang}{/if}
@@ -52,7 +52,7 @@
 		<dl{if $errorField == 'password'} class="formError"{/if}>
 			<dt><label for="password">{lang}wcf.global.createUser.password{/lang}</label></dt>
 			<dd>
-				<input type="password" id="password" name="password" value="{$password}" required="required" class="medium">
+				<input type="password" id="password" name="password" value="{$password}" required class="medium">
 				{if $errorField == 'password'}
 					<small class="innerError">
 						{if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if}
@@ -64,7 +64,7 @@
 		<dl{if $errorField == 'confirmPassword'} class="formError"{/if}>
 			<dt><label for="confirmPassword">{lang}wcf.global.createUser.confirmPassword{/lang}</label></dt>
 			<dd>
-				<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" required="required" class="medium">
+				<input type="password" id="confirmPassword" name="confirmPassword" value="{$confirmPassword}" required class="medium">
 				{if $errorField == 'confirmPassword'}
 					<small class="innerError">
 						{if $errorType == 'notEqual'}{lang}wcf.global.createUser.error.confirmPassword.notEqual{/lang}{/if}
diff --git a/wcfsetup/setup/template/stepSelectLanguages.tpl b/wcfsetup/setup/template/stepSelectLanguages.tpl
index bd66fdb9eb..290f6e4ac8 100644
--- a/wcfsetup/setup/template/stepSelectLanguages.tpl
+++ b/wcfsetup/setup/template/stepSelectLanguages.tpl
@@ -15,7 +15,7 @@
 			<dt>{lang}wcf.global.languages.languages{/lang}</dt>
 			<dd>
 				{foreach from=$availableLanguages key=availableLanguageCode item=languageName}
-					<label><input type="checkbox" name="selectedLanguages[]" value="{@$availableLanguageCode}"{if $availableLanguageCode|in_array:$selectedLanguages} checked="checked"{/if}> {$languageName} ({$availableLanguageCode})</label>
+					<label><input type="checkbox" name="selectedLanguages[]" value="{@$availableLanguageCode}"{if $availableLanguageCode|in_array:$selectedLanguages} checked{/if}> {$languageName} ({$availableLanguageCode})</label>
 				{/foreach}
 			</dd>
 		</dl>
diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
index 57b41d3460..3293608a73 100644
--- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
+++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl
@@ -12,7 +12,7 @@
 			<dd>
 				{capture assign=languageChooser}<select name="languageCode" id="languageCode">
 					{foreach from=$availableLanguages key=availableLanguageCode item=languageName}
-						<option value="{$availableLanguageCode}"{if $availableLanguageCode == $languageCode} selected="selected"{/if}>{$languageName} ({$availableLanguageCode})</option>
+						<option value="{$availableLanguageCode}"{if $availableLanguageCode == $languageCode} selected{/if}>{$languageName} ({$availableLanguageCode})</option>
 					{/foreach}
 					</select>{/capture}
 				<label for="languageCode">{lang}wcf.global.welcome.language.description{/lang}</label>
diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl
index 7485ff9330..b542284a43 100644
--- a/wcfsetup/setup/template/stepShowLicense.tpl
+++ b/wcfsetup/setup/template/stepShowLicense.tpl
@@ -10,7 +10,7 @@
 		<dl{if $missingAcception|isset} class="formError"{/if}>
 			<dt></dt>
 			<dd>
-				<textarea rows="20" cols="40" readonly="readonly" autofocus="autofocus" id="license">{$license}</textarea>
+				<textarea rows="20" cols="40" readonly autofocus id="license">{$license}</textarea>
 				<label><input type="checkbox" name="accepted" value="1"> {lang}wcf.global.license.accept.description{/lang}</label>
 				{if $missingAcception|isset}
 					<small class="innerError">
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 9a19e3e934..de9f167fa3 100644
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -108,7 +108,7 @@
 	</section>
 
 	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.memoryLimit.result || !$system.gdLib.result} disabled="disabled"{/if} accesskey="s">
+		<input type="submit" value="{lang}wcf.global.button.next{/lang}"{if !$system.phpVersion.result || !$system.sql.result || !$system.memoryLimit.result || !$system.gdLib.result} disabled{/if} accesskey="s">
 		<input type="hidden" name="step" value="{@$nextStep}">
 		<input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}">
 		<input type="hidden" name="languageCode" value="{@$languageCode}">