diff --git a/modules/data/webadmin/tmpl/add_edit_chan.tmpl b/modules/data/webadmin/tmpl/add_edit_chan.tmpl
index 7e7673ee..1d030d0b 100644
--- a/modules/data/webadmin/tmpl/add_edit_chan.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_chan.tmpl
@@ -14,27 +14,27 @@
 			<div class="sectionbody">
 				<? IF !Edit ?>
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Channel Name:" ?></div>
-					<input type="text" name="name" value=""
+					<div class="inputlabel"><label for="name"><? FORMAT "Channel Name:" ?></label></div>
+					<input id="name" type="text" name="name" value=""
 						   title="<? FORMAT "The channel name." ?>"/>
 				</div>
 				<? ENDIF ?>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Key:" ?></div>
-					<input type="text" name="key" value="<? VAR Key ?>" size="10"
+					<div class="inputlabel"><label for="key"><? FORMAT "Key:" ?></label></div>
+					<input id="key" type="text" name="key" value="<? VAR Key ?>" size="10"
 						   title="<? FORMAT "The password of the channel, if there is one." ?>"/>
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Buffer Size:" ?></div>
-					<input type="number" name="buffersize" value="<? VAR BufferSize ?>" size="10" min="0"
+					<div class="inputlabel"><label for="buffersize"><? FORMAT "Buffer Size:" ?></label></div>
+					<input id="buffersize" type="number" name="buffersize" value="<? VAR BufferSize ?>" size="10" min="0"
 						   title="<? FORMAT "The buffer count." ?>"/>
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Default Modes:" ?></div>
-					<input type="text" name="defmodes" value="<? VAR DefModes ?>" size="10"
+					<div class="inputlabel"><label for="defmodes"><? FORMAT "Default Modes:" ?></label></div>
+					<input id="defmodes" type="text" name="defmodes" value="<? VAR DefModes ?>" size="10"
 						   title="<? FORMAT "The default modes of the channel." ?>"/>
 				</div>
 
diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl
index c5af1634..f8eda3a1 100644
--- a/modules/data/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl
@@ -26,44 +26,44 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Network Name:" ?></div>
-					<input type="text" name="name" value="<? VAR Name ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="name"><? FORMAT "Network Name:" ?></label></div>
+					<input id="name" type="text" name="name" value="<? VAR Name ?>" class="half" maxlength="128"
 						   title="<? FORMAT "The name of the IRC network." ?>"/>
 				</div>
 
             	<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Nickname:" ?></div>
-					<input type="text" name="nick" value="<? VAR Nick ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="nick"><? FORMAT "Nickname:" ?></label></div>
+					<input id="nick" type="text" name="nick" value="<? VAR Nick ?>" class="half" maxlength="128"
 						   title="<? FORMAT "Your nickname on IRC." ?>"/>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Alt. Nickname:" ?></div>
-					<input type="text" name="altnick" value="<? VAR AltNick ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="altnick"><? FORMAT "Alt. Nickname:" ?></label></div>
+					<input id="altnick" type="text" name="altnick" value="<? VAR AltNick ?>" class="half" maxlength="128"
 						   title="<? FORMAT "Your secondary nickname, if the first is not available on IRC." ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Ident:" ?></div>
-					<input type="text" name="ident" value="<? VAR Ident ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="ident"><? FORMAT "Ident:" ?></label></div>
+					<input id="ident" type="text" name="ident" value="<? VAR Ident ?>" class="half" maxlength="128"
 						   title="<? FORMAT "Your ident." ?>"/>
 				</div>
                 <div class="subsection">
-					<div class="inputlabel"><? FORMAT "Realname:" ?></div>
-					<input type="text" name="realname" value="<? VAR RealName ?>" class="full" maxlength="256"
+					<div class="inputlabel"><label for="realname"><? FORMAT "Realname:" ?></label></div>
+					<input id="realname" type="text" name="realname" value="<? VAR RealName ?>" class="full" maxlength="256"
 						   title="<? FORMAT "Your real name." ?>"/>
 				</div>
 
 				<? IF BindHostEdit ?>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "BindHost:" ?></div>
-					<input type="text" name="bindhost" value="<? VAR BindHost ?>"/>
+					<div class="inputlabel"><label for="bindhost"><? FORMAT "BindHost:" ?></label></div>
+					<input id="bindhost" type="text" name="bindhost" value="<? VAR BindHost ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 				<? ENDIF ?>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Quit Message:" ?></div>
-					<input type="text" name="quitmsg" value="<? VAR QuitMsg ?>" class="full" maxlength="256"
+					<div class="inputlabel"><label for="quitmsg"><? FORMAT "Quit Message:" ?></label></div>
+					<input id="quitmsg" type="text" name="quitmsg" value="<? VAR QuitMsg ?>" class="full" maxlength="256"
 						   title="<? FORMAT "You may define a Message shown, when you quit IRC." ?>"/>
 				</div>
 
@@ -86,7 +86,7 @@
 				</div>
 
 				<div class="subsection half" id="servers_plain">
-					<div class="inputlabel"><? FORMAT "Servers of this IRC network:" ?></div>
+					<div class="inputlabel"><label for="servers_text"><? FORMAT "Servers of this IRC network:" ?></servers></div>
 					<div><textarea name="servers" cols="70" rows="5" id="servers_text"><? LOOP ServerLoop ?><? VAR Server ?>
 <? ENDLOOP ?>
 </textarea></div>
@@ -113,8 +113,8 @@
 				<script type="text/javascript">serverlist_init(jQuery);</script>
 
 				<div class="subsection full">
-					<div class="inputlabel"><? FORMAT "SHA-256 fingerprints of trusted SSL certificates of this IRC network:" ?></div>
-					<div><textarea name="fingerprints" cols="50" rows="5"><? LOOP TrustedFingerprints ?><? VAR FP ?>
+					<div class="inputlabel"><label for="fingerprints"><? FORMAT "SHA-256 fingerprints of trusted SSL certificates of this IRC network:" ?></label></div>
+					<div><textarea id="fingerprints" name="fingerprints" cols="50" rows="5"><? LOOP TrustedFingerprints ?><? VAR FP ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info"><? FORMAT "When these certificates are encountered, checks for hostname, expiration date, CA are skipped" ?></span>
@@ -131,7 +131,7 @@
 					</div>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Flood protection rate:" ?></div>
+					<div class="inputlabel"><label for="floodrate"><? FORMAT "Flood protection rate:" ?></label></div>
 					<? SETBLOCK FloodInputField_Rate ?>
 						<input type="number" name="floodrate" min="0.3" step="0.05" id="floodrate"
 						   title="<? FORMAT "The number of seconds per line. After changing this, reconnect ZNC to server." ?>"
@@ -141,7 +141,7 @@
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Flood protection burst:" ?></div>
+					<div class="inputlabel"><label for="floodburst"><? FORMAT "Flood protection burst:" ?></label></div>
 					<? SETBLOCK FloodInputField_Burst ?>
 						<input type="number" name="floodburst" min="1" id="floodburst"
 						   title="<? FORMAT "Defines the number of lines, which can be sent immediately. After changing this, reconnect ZNC to server." ?>"
@@ -151,7 +151,7 @@
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Channel join delay:" ?></div>
+					<div class="inputlabel"><label for="joindelay"><? FORMAT "Channel join delay:" ?></label></div>
 					<? SETBLOCK ChannelJoinDelayInputField ?>
 						<input type="number" name="joindelay" min="0" id="joindelay"
 						   title="<? FORMAT "Defines the delay in seconds, until channels are joined after getting connected." ?>"
@@ -184,12 +184,12 @@
 					<tr>
 						<td>[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>addchan?user=<? VAR Username ESC=URL ?>&amp;network=<? VAR Name ESC=URL ?>"><? FORMAT "Add" ?></a>]</td>
 				<? IF ChannelLoop ?>
-						<td><? FORMAT "Save" ?></td>
-						<td><? FORMAT "Name" ?></td>
-						<td><? FORMAT "CurModes" ?></td>
-						<td><? FORMAT "DefModes" ?></td>
-						<td><? FORMAT "BufferSize" ?></td>
-						<td><? FORMAT "Options" ?></td>
+						<th><? FORMAT "Save" ?></th>
+						<th><? FORMAT "Name" ?></th>
+						<th><? FORMAT "CurModes" ?></th>
+						<th><? FORMAT "DefModes" ?></th>
+						<th><? FORMAT "BufferSize" ?></th>
+						<th><? FORMAT "Options" ?></th>
 				<? ELSE ?>
 						<td><? FORMAT "← Add a channel (opens in same page)" ?></td>
 				<? ENDIF ?>
@@ -225,11 +225,11 @@
 				<table>
 					<thead>
 					<tr>
-						<td><? FORMAT "Name" ?></td>
-						<td><? FORMAT "Arguments" ?></td>
-						<td><? FORMAT "Description" ?></td>
-						<td><? FORMAT "Loaded globally" ?></td>
-						<td><? FORMAT "Loaded by user" ?></td>
+						<th><? FORMAT "Name" ?></th>
+						<th><? FORMAT "Arguments" ?></th>
+						<th><? FORMAT "Description" ?></th>
+						<th><? FORMAT "Loaded globally" ?></th>
+						<th><? FORMAT "Loaded by user" ?></th>
 					</tr>
 					</thead>
 					<tbody>
diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index 5c5b4bef..204c37d9 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -16,33 +16,33 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Username:" ?></div>
+					<div class="inputlabel"><label for="user"><? FORMAT "Username:" ?></label></div>
 
 						<? IF Clone ?>
 						<input type="hidden" name="clone" value="<? VAR CloneUsername ?>" />
 						<? ENDIF ?>
 						<? IF Edit ?>
 						<input type="hidden" name="user" value="<? VAR Username ?>" />
-						<input type="text" name="newuser" value="<? VAR Username ?>" class="half" maxlength="128" disabled="disabled" />
+						<input id="user" type="text" name="newuser" value="<? VAR Username ?>" class="half" maxlength="128" disabled="disabled" />
 						<? ELSE ?>
-						<input type="text" name="user" value="<? VAR Username ?>" class="half" maxlength="128"
+						<input id="user" type="text" name="user" value="<? VAR Username ?>" class="half" maxlength="128"
 							   title="<? FORMAT "Please enter a username." ?>"/>
 						<? ENDIF ?>
 
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Password:" ?></div>
-					<input type="password" name="password" class="half"
+					<div class="inputlabel"><label for="password"><? FORMAT "Password:" ?></label></div>
+					<input id="password" type="password" name="password" class="half"
 						   title="<? FORMAT "Please enter a password." ?>" autocomplete="off" />
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Confirm password:" ?></div>
-					<input type="password" name="password2" class="half"
+					<div class="inputlabel"><label for="password2"><? FORMAT "Confirm password:" ?></label></div>
+					<input id="password2" type="password" name="password2" class="half"
 						   title="<? FORMAT "Please re-type the above password." ?>"/>
 				</div>
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Allowed IPs:" ?></div>
-					<textarea name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ?>
+					<div class="inputlabel"><label for="allowedips"><? FORMAT "Allowed IPs:" ?></label></div>
+					<textarea id="allowedips" name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ?>
 <? ENDLOOP ?>
 </textarea>
 					<br /><span class="info"><? FORMAT "Leave empty to allow connections from all IPs.<br/>Otherwise, one entry per line, wildcards * and ? are available." ?></span>
@@ -60,50 +60,50 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Nickname:" ?></div>
-					<input type="text" name="nick" value="<? VAR Nick ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="nick"><? FORMAT "Nickname:" ?></label></div>
+					<input id="nick" type="text" name="nick" value="<? VAR Nick ?>" class="half" maxlength="128"
 						   title="<? FORMAT "Your nickname on IRC." ?>"/>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Alt. Nickname:" ?></div>
-					<input type="text" name="altnick" value="<? VAR AltNick ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="altnick"><? FORMAT "Alt. Nickname:" ?></label></div>
+					<input id="altnick" type="text" name="altnick" value="<? VAR AltNick ?>" class="half" maxlength="128"
 						   title="<? FORMAT "Your secondary nickname, if the first is not available on IRC." ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Ident:" ?></div>
-					<input type="text" name="ident" value="<? VAR Ident ?>" class="half" maxlength="128"
+					<div class="inputlabel"><label for="ident"><? FORMAT "Ident:" ?></label></div>
+					<input id="ident" type="text" name="ident" value="<? VAR Ident ?>" class="half" maxlength="128"
 						   title="<? FORMAT "The Ident is sent to server as username." ?>"/>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Status Prefix:" ?></div>
-					<input type="text" name="statusprefix" value="<? VAR StatusPrefix ?>" class="half" maxlength="5"
+					<div class="inputlabel"><label for="statusprefix"><? FORMAT "Status Prefix:" ?></label></div>
+					<input id="statusprefix" type="text" name="statusprefix" value="<? VAR StatusPrefix ?>" class="half" maxlength="5"
 						   title="<? FORMAT "The prefix for the status and module queries." ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Realname:" ?></div>
-					<input type="text" name="realname" value="<? VAR RealName ?>" class="full" maxlength="256"
+					<div class="inputlabel"><label for="realname"><? FORMAT "Realname:" ?></label></div>
+					<input id="realname" type="text" name="realname" value="<? VAR RealName ?>" class="full" maxlength="256"
 						   title="<? FORMAT "Your real name." ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 
 				<? IF BindHostEdit ?>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "BindHost:" ?></div>
-					<input type="text" name="bindhost" value="<? VAR BindHost ?>"/>
+					<div class="inputlabel"><label for="bindhost"><? FORMAT "BindHost:" ?></label></div>
+					<input id="bindhost" type="text" name="bindhost" value="<? VAR BindHost ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "DCCBindHost:" ?></div>
-					<input type="text" name="dccbindhost" value="<? VAR DCCBindHost ?>"/>
+					<div class="inputlabel"><label for="dccbindhost"><? FORMAT "DCCBindHost:" ?></label></div>
+					<input id="dccbindhost" type="text" name="dccbindhost" value="<? VAR DCCBindHost ?>"/>
 				</div>
 				<div style="clear: both;"></div>
 				<? ENDIF ?>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Quit Message:" ?></div>
+					<div class="inputlabel"><label for="quitmsg"><? FORMAT "Quit Message:" ?></label></div>
 					<input type="text" name="quitmsg" value="<? VAR QuitMsg ?>" class="full" maxlength="256"
 						   title="<? FORMAT "You may define a Message shown, when you quit IRC." ?>"/>
 				</div>
@@ -122,10 +122,10 @@
 					<tr>
 						<td class="ignore-sort">[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>addnetwork?user=<? VAR Username ESC=URL ?>"><? FORMAT "Add" ?></a>]</td>
 				<? IF NetworkLoop ?>
-						<td><? FORMAT "Name" ?></td>
-						<td><? FORMAT "Clients" ?></td>
-						<td><? FORMAT "Current Server" ?></td>
-						<td><? FORMAT "Nick" ?></td>
+						<th><? FORMAT "Name" ?></th>
+						<th><? FORMAT "Clients" ?></th>
+						<th><? FORMAT "Current Server" ?></th>
+						<th><? FORMAT "Nick" ?></th>
 					<? ELSE ?>
 						<td><? FORMAT "← Add a network (opens in same page)" ?></td>
 				<? ENDIF ?>
@@ -165,11 +165,11 @@
 				<table>
 					<thead>
 					<tr>
-						<td><? FORMAT "Name" ?></td>
-						<td><? FORMAT "Arguments" ?></td>
-						<td><? FORMAT "Description" ?></td>
-						<td><? FORMAT "Loaded globally" ?></td>
-						<td><? FORMAT "Loaded by networks" ?></td>
+						<th><? FORMAT "Name" ?></th>
+						<th><? FORMAT "Arguments" ?></th>
+						<th><? FORMAT "Description" ?></th>
+						<th><? FORMAT "Loaded globally" ?></th>
+						<th><? FORMAT "Loaded by networks" ?></th>
 					</tr>
 					</thead>
 					<tbody>
@@ -226,14 +226,14 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection third">
-					<div class="inputlabel"><? FORMAT "Default Modes:" ?></div>
-					<input type="text" name="chanmodes" value="<? VAR DefaultChanModes ?>" maxlength="32"
+					<div class="inputlabel"><label for="chanmodes"><? FORMAT "Default Modes:" ?></label></div>
+					<input id="chanmodes" type="text" name="chanmodes" value="<? VAR DefaultChanModes ?>" maxlength="32"
 						   title="<? FORMAT "These are the default modes ZNC will set when you join an empty channel." ?>"/>
 					<br /><span class="info"><? FORMAT "Empty = use standard value" ?></span>
 				</div>
 				<div class="subsection third">
-					<div class="inputlabel"><? FORMAT "Buffer Size:" ?></div>
-					<input type="number" name="chanbufsize" value="<? VAR ChanBufferSize ?>" min="0"
+					<div class="inputlabel"><label for="chanbufsize"><? FORMAT "Buffer Size:" ?></label></div>
+					<input id="chanbufsize" type="number" name="chanbufsize" value="<? VAR ChanBufferSize ?>" min="0"
 						   title="<? FORMAT "This is the amount of lines that the playback buffer will store for channels before dropping off the oldest line. The buffers are stored in the memory by default." ?>"/>
 					<br /><span class="info"><? FORMAT "Empty = use standard value" ?></span>
 				</div>
@@ -246,13 +246,13 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection third">
-					<div class="inputlabel"><? FORMAT "Max Buffers:" ?></div>
-					<input type="number" name="maxquerybuffers" value="<? VAR MaxQueryBuffers ?>" class="third" min="0"
+					<div class="inputlabel"><label for="maxquerybuffers"><? FORMAT "Max Buffers:" ?></label></div>
+					<input id="maxquerybuffers" type="number" name="maxquerybuffers" value="<? VAR MaxQueryBuffers ?>" class="third" min="0"
 						   title="<? FORMAT "Maximum number of query buffers. 0 is unlimited." ?>"/>
 				</div>
 				<div class="subsection third">
-					<div class="inputlabel"><? FORMAT "Buffer Size:" ?></div>
-					<input type="number" name="querybufsize" value="<? VAR QueryBufferSize ?>" min="0"
+					<div class="inputlabel"><label for="querybufsize"><? FORMAT "Buffer Size:" ?></label></div>
+					<input id="querybufsize" type="number" name="querybufsize" value="<? VAR QueryBufferSize ?>" min="0"
 						   title="<? FORMAT "This is the amount of lines that the playback buffer will store for queries before dropping off the oldest line. The buffers are stored in the memory by default." ?>"/>
 					<br /><span class="info"><? FORMAT "Empty = use standard value" ?></span>
 				</div>
@@ -281,13 +281,13 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Timestamp Format:" ?></div>
-					<input type="text" name="timestampformat" value="<? VAR TimestampFormat ?>" class="full"
+					<div class="inputlabel"><label for="timestampformat"><? FORMAT "Timestamp Format:" ?></label></div>
+					<input id="timestampformat" type="text" name="timestampformat" value="<? VAR TimestampFormat ?>" class="full"
 						   title="<? FORMAT "The format for the timestamps used in buffers, for example [%H:%M:%S]. This setting is ignored in new IRC clients, which use server-time. If your client supports server-time, change timestamp format in client settings instead." ?>"/>
 				</div>
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Timezone:" ?></div>
-					<input type="text" name="timezone" value="<? VAR Timezone ?>" list="timezone_list"
+					<div class="inputlabel"><label for="timezone"><? FORMAT "Timezone:" ?></label></div>
+					<input id="timezone" type="text" name="timezone" value="<? VAR Timezone ?>" list="timezone_list"
 						   title="Select your timezone." />
 					<br /><span class="info"><? FORMAT "E.g. <code>Europe/Berlin</code>, or <code>GMT-6</code>" ?></span>
 					<datalist id="timezone_list">
@@ -303,25 +303,25 @@
 				</div>
 				<div style="clear:both;"></div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Join Tries:" ?></div>
-					<input type="number" name="jointries" value="<? VAR JoinTries ?>" class="third" min="0"
+					<div class="inputlabel"><label for="jointries"><? FORMAT "Join Tries:" ?></label></div>
+					<input id="jointries" type="number" name="jointries" value="<? VAR JoinTries ?>" class="third" min="0"
 						   title="<? FORMAT "This defines how many times ZNC tries to join a channel, if the first join failed, e.g. due to channel mode +i/+k or if you are banned." ?>"/>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Join speed:" ?></div>
-					<input type="number" name="maxjoins" value="<? VAR MaxJoins ?>" class="third" min="0"
+					<div class="inputlabel"><label for="maxjoins"><? FORMAT "Join speed:" ?></label></div>
+					<input id="maxjoins" type="number" name="maxjoins" value="<? VAR MaxJoins ?>" class="third" min="0"
 					       title="<? FORMAT "How many channels are joined in one JOIN command. 0 is unlimited (default). Set to small positive value if you get disconnected with “Max SendQ Exceeded”" ?>"/>
 				</div>
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Max IRC Networks Number:" ?></div>
+					<div class="inputlabel"><label for="maxnetworks"><? FORMAT "Max IRC Networks Number:" ?></label></div>
 					<input type="number" name="maxnetworks" value="<? VAR MaxNetworks ?>" class="third" min="0"
 					       title="<? FORMAT "Maximum number of IRC networks allowed for this user." ?>" <? IF !ImAdmin ?>disabled="disabled"<? ENDIF ?> />
 				</div>
 
 				<? SETBLOCK Substitutions_Link ?><a href="http://wiki.znc.in/ExpandString" target="_blank" class="external"><? FORMAT "Substitutions" ?></a><? ENDSETBLOCK ?>
 				<div class="subsection half" id="ctcpreplies_plain">
-					<div class="inputlabel"><? FORMAT "CTCP Replies:" ?></div>
-					<div><textarea name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?>
+					<div class="inputlabel"><label for="ctcpreplies"><? FORMAT "CTCP Replies:" ?></label></div>
+					<div><textarea id="ctcpreplies" name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info"><? FORMAT "One reply per line. Example: <code>TIME Buy a watch!</code>" ?></span>
@@ -359,10 +359,10 @@
 				<script type="text/javascript">ctcpreplies_init(jQuery);</script>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Skin:" ?></div>
+					<div class="inputlabel"><label for="skin"><? FORMAT "Skin:" ?></label></div>
 
 						<? IF SkinLoop ROWS > 1 ?>
-						<select name="skin">
+						<select id="skin" name="skin">
 							<option value=""><? FORMAT "- Global -" ?></option>
 							<? LOOP SkinLoop ?>
 							<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?><? FORMAT "Default" ?><? ELSE ?><? VAR Name ?><? ENDIF ?></option>
@@ -375,10 +375,10 @@
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Language:" ?></div>
+					<div class="inputlabel"><label for="language"><? FORMAT "Language:" ?></label></div>
 
 					<? IF HaveI18N ?>
-					<select name="language">
+					<select id="language" name="language">
 						<? LOOP LanguageLoop ?>
 						<option value="<? VAR Code ?>" <? IF Language TOP == *Code ?>selected="selected"<? ENDIF ?>><? VAR Name ?></option>
 						<? ENDLOOP ?>
diff --git a/modules/data/webadmin/tmpl/listusers.tmpl b/modules/data/webadmin/tmpl/listusers.tmpl
index 59e322ef..3d8a0629 100644
--- a/modules/data/webadmin/tmpl/listusers.tmpl
+++ b/modules/data/webadmin/tmpl/listusers.tmpl
@@ -13,9 +13,9 @@
 					<thead>
 					<tr>
 						<td class="ignore-sort">[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>adduser"><? FORMAT "Add" ?></a>]</td>
-						<td><? FORMAT "Username" ?></td>
-                        <td><? FORMAT "Networks" ?></td>
-						<td><? FORMAT "Clients" ?></td>
+						<th><? FORMAT "Username" ?></th>
+                        <th><? FORMAT "Networks" ?></th>
+						<th><? FORMAT "Clients" ?></th>
 					</tr>
 					</thead>
 
diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
index 8d80c859..281b4344 100644
--- a/modules/data/webadmin/tmpl/settings.tmpl
+++ b/modules/data/webadmin/tmpl/settings.tmpl
@@ -10,15 +10,15 @@
 				<table>
 					<thead>
 						<tr>
-						    <td><? FORMAT "Port" ?></td>
-						    <td><? FORMAT "BindHost" ?></td>
-						    <td><? FORMAT "SSL" ?></td>
-						    <td><? FORMAT "IPv4" ?></td>
-						    <td><? FORMAT "IPv6" ?></td>
-						    <td><? FORMAT "IRC" ?></td>
-						    <td><? FORMAT "HTTP" ?></td>
-						    <td><? FORMAT "URIPrefix" ?></td>
-						    <td><? FORMAT "Delete" ?></td>
+						    <th><? FORMAT "Port" ?></th>
+						    <th><? FORMAT "BindHost" ?></th>
+						    <th><? FORMAT "SSL" ?></th>
+						    <th><? FORMAT "IPv4" ?></th>
+						    <th><? FORMAT "IPv6" ?></th>
+						    <th><? FORMAT "IRC" ?></th>
+						    <th><? FORMAT "HTTP" ?></th>
+						    <th><? FORMAT "URIPrefix" ?></th>
+						    <th><? FORMAT "Delete" ?></th>
 						</tr>
 					</thead>
 
@@ -87,9 +87,9 @@
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection">
-					<div class="inputlabel"><? FORMAT "Skin:" ?></div>
+					<div class="inputlabel"><label for="skin"><? FORMAT "Skin:" ?></label></div>
 
-						<select name="skin">
+						<select id="skin" name="skin">
 							<? LOOP SkinLoop ?>
 							<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?><? FORMAT "Default" ?><? ELSE ?><? VAR Name ?><? ENDIF ?></option>
 							<? ENDLOOP ?>
@@ -99,37 +99,37 @@
 
 
 				<div class="subsection third">
-					<div class="inputlabel"><? FORMAT "Status Prefix:" ?></div>
-					<input type="text" name="statusprefix" value="<? VAR StatusPrefix ?>"
+					<div class="inputlabel"><label for="statusprefix"><? FORMAT "Status Prefix:" ?></label></div>
+					<input id="statusprefix" type="text" name="statusprefix" value="<? VAR StatusPrefix ?>"
 						   title="<? FORMAT "The prefix for the status and module queries." ?>"/>
 					<br /><span class="info"><? FORMAT "Default for new users only." ?></span>
 				</div>
 
 
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Maximum Buffer Size:" ?></div>
-					<input type="number" name="maxbufsize" value="<? VAR MaxBufferSize ?>"
+					<div class="inputlabel"><label for="maxbufsize"><? FORMAT "Maximum Buffer Size:" ?></label></div>
+					<input id="maxbufsize" type="number" name="maxbufsize" value="<? VAR MaxBufferSize ?>"
 						   title="<? FORMAT "Sets the global Max Buffer Size a user can have." ?>"/>
 				</div>
 
 
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Connect Delay:" ?></div>
-					<input type="number" name="connectdelay" value="<? VAR ConnectDelay ?>"
+					<div class="inputlabel"><label for="connectdelay"><? FORMAT "Connect Delay:" ?></label></div>
+					<input id="connectdelay" type="number" name="connectdelay" value="<? VAR ConnectDelay ?>"
 						   title="<? FORMAT "The time between connection attempts to IRC servers, in seconds. This affects the connection between ZNC and the IRC server; not the connection between your IRC client and ZNC." ?>"/>
 				</div>
 
 
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Server Throttle:" ?></div>
-					<input type="number" name="serverthrottle" value="<? VAR ServerThrottle ?>"
+					<div class="inputlabel"><label for="serverthrottle"><? FORMAT "Server Throttle:" ?></label></div>
+					<input id="serverthrottle" type="number" name="serverthrottle" value="<? VAR ServerThrottle ?>"
 						   title="<? FORMAT "The minimal time between two connect attempts to the same hostname, in seconds. Some servers refuse your connection if you reconnect too fast." ?>"/>
 				</div>
 
 
 				<div class="subsection half">
-					<div class="inputlabel"><? FORMAT "Anonymous Connection Limit per IP:" ?></div>
-					<input type="number" name="anoniplimit" value="<? VAR AnonIPLimit ?>"
+					<div class="inputlabel"><label for="anoniplimit"><? FORMAT "Anonymous Connection Limit per IP:" ?></label></div>
+					<input id="anoniplimit" type="number" name="anoniplimit" value="<? VAR AnonIPLimit ?>"
 						   title="<? FORMAT "Limits the number of unidentified connections per IP." ?>"/>
 				</div>
 
@@ -149,8 +149,8 @@
 
 
 				<div class="subsection twothird">
-					<div class="inputlabel"><? FORMAT "MOTD:" ?></div>
-					<textarea name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
+					<div class="inputlabel"><label for="motd"><? FORMAT "MOTD:" ?></label></div>
+					<textarea id="motd" name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
 <? ENDLOOP ?>
 </textarea>
 					<br /><span class="info"><? FORMAT "“Message of the Day”, sent to all ZNC users on connect." ?></span>
@@ -167,11 +167,11 @@
 				<table>
 					<thead>
 					<tr>
-						<td><? FORMAT "Name" ?></td>
-						<td><? FORMAT "Arguments" ?></td>
-						<td><? FORMAT "Description" ?></td>
-						<td><? FORMAT "Loaded by networks" ?></td>
-						<td><? FORMAT "Loaded by users" ?></td>
+						<th><? FORMAT "Name" ?></th>
+						<th><? FORMAT "Arguments" ?></th>
+						<th><? FORMAT "Description" ?></th>
+						<th><? FORMAT "Loaded by networks" ?></th>
+						<th><? FORMAT "Loaded by users" ?></th>
 					</tr>
 					</thead>
 					<tbody>
diff --git a/modules/data/webadmin/tmpl/traffic.tmpl b/modules/data/webadmin/tmpl/traffic.tmpl
index 51cb3b8c..c4633bf5 100644
--- a/modules/data/webadmin/tmpl/traffic.tmpl
+++ b/modules/data/webadmin/tmpl/traffic.tmpl
@@ -67,9 +67,9 @@
 				<thead>
 					<tr>
 						<td></td>
-						<td><? FORMAT CTX="Traffic" "In" ?></td>
-						<td><? FORMAT CTX="Traffic" "Out" ?></td>
-						<td><? FORMAT "Total" ?></td>
+						<th><? FORMAT CTX="Traffic" "In" ?></th>
+						<th><? FORMAT CTX="Traffic" "Out" ?></th>
+						<th><? FORMAT "Total" ?></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -110,11 +110,11 @@
 			<table>
 				<thead>
 					<tr>
-						<td><? FORMAT "User" ?></td>
-						<td><? FORMAT "Network" ?></td>
-						<td><? FORMAT CTX="Traffic" "In" ?></td>
-						<td><? FORMAT CTX="Traffic" "Out" ?></td>
-						<td><? FORMAT "Total" ?></td>
+						<th><? FORMAT "User" ?></th>
+						<th><? FORMAT "Network" ?></th>
+						<th><? FORMAT CTX="Traffic" "In" ?></th>
+						<th><? FORMAT CTX="Traffic" "Out" ?></th>
+						<th><? FORMAT "Total" ?></th>
 					</tr>
 				</thead>
 				<tbody>
diff --git a/webskins/_default_/tmpl/LoginBar.tmpl b/webskins/_default_/tmpl/LoginBar.tmpl
index d837a3b1..5c245a8b 100644
--- a/webskins/_default_/tmpl/LoginBar.tmpl
+++ b/webskins/_default_/tmpl/LoginBar.tmpl
@@ -7,8 +7,8 @@
 				<form action="<? VAR URIPrefix TOP ?>/login" method="post">
 					<div class="loginbox">
 						<input type="hidden" name="submitted" value="1" />
-						User:<input type="text" name="user" />
-						Pass:<input type="password" name="pass" />
+						<label for="user">User:</label><input id="user" type="text" name="user" />
+						<label for="pass">Pass:</label><input id="pass" type="password" name="pass" />
 						<input type="submit" class="submit" value="Login" />
 					</div>
 				</form>