diff --git a/pythonrewrite/plugins/date/form_date.cs b/pythonrewrite/plugins/date/form_date.cs
index 451f96d..ff33a18 100644
--- a/pythonrewrite/plugins/date/form_date.cs
+++ b/pythonrewrite/plugins/date/form_date.cs
@@ -5,30 +5,30 @@
 <?cs call:print_form_header("plugins/date") ?>
 
 	<p><label for="date"><?cs var:html_escape(Lang.Plugins.date.Text.Date) ?>: </label><br/>
-		<select name="day" size="0"><?cs
+		<select name="day" tabindex="1" size="0"><?cs
 			loop: x = #1, #31, #1 ?>
 				<?cs if:x == Data.Plugins.date.day ?><option selected="selected"><?cs
 					else ?><option><?cs /if ?><?cs var:x ?></option><?cs /loop ?>
 		</select>
-		<select name="month" size="0"><?cs
+		<select name="month" tabindex="2" size="0"><?cs
 			loop: x = #1, #12, #1 ?>
 				<?cs if:x == Data.Plugins.date.month ?><option selected="selected" <?cs
 					else ?><option <?cs /if ?>value="<?cs var:x ?>"><?cs
 					var:html_escape(Lang.Plugins.date.Text.Months[x]) ?></option><?cs /loop ?>
 		</select>
-		<select name="year" size="0"><?cs
+		<select name="year" tabindex="3" size="0"><?cs
 			loop: x = #2006, #2025, #1 ?>
 				<?cs if:x == Data.Plugins.date.year ?><option selected="selected"><?cs
 					else ?><option><?cs /if ?><?cs var:x ?></option><?cs /loop ?>
 		</select></p>
 
 	<p><label for="time"><?cs var:html_escape(Lang.Plugins.date.Text.Time) ?>: </label><br/>
-		<select name="hour" size="0"><?cs
+		<select name="hour" tabindex="4" size="0"><?cs
 			loop: x = #0, #23, #1 ?>
 				<?cs if:x == Data.Plugins.date.hour ?><option selected="selected"><?cs
 					else ?><option><?cs /if ?><?cs if:x<10 ?>0<?cs /if ?><?cs var:x ?></option><?cs /loop ?>
 		</select>&nbsp;:&nbsp;
-		<select name="minute" size="0"><?cs
+		<select name="minute" tabindex="5" size="0"><?cs
 			loop: x = #0, #59, #1 ?>
 				<?cs if:x == Data.Plugins.date.minute ?><option selected="selected"><?cs
 					else ?><option><?cs /if ?><?cs if:x<10 ?>0<?cs /if ?><?cs var:x ?></option><?cs /loop ?>
@@ -36,7 +36,7 @@
 	
 	<input type="hidden" name="store" value="yes" />
 
-	<button type="submit"><?cs var:html_escape(Lang.Plugins.date.Button.ConfigDate) ?></button>
+	<button type="submit" tabindex="6"><?cs var:html_escape(Lang.Plugins.date.Button.ConfigDate) ?></button>
 
 </form>
 
diff --git a/pythonrewrite/plugins/network/form_network.cs b/pythonrewrite/plugins/network/form_network.cs
index 4ca71f8..14d1179 100644
--- a/pythonrewrite/plugins/network/form_network.cs
+++ b/pythonrewrite/plugins/network/form_network.cs
@@ -5,16 +5,16 @@
 <?cs call:print_form_header("plugins/network") ?>
 
 	<p><label for="ip"><?cs var:html_escape(Lang.Plugins.network.Text.IP) ?>: </label><br/>
-		<input type="text" name="ip1" size="3" id="ip" value="<?cs
+		<input type="text" tabindex="1" name="ip1" size="3" id="ip" value="<?cs
 			var:Data.Plugins.network.ip.oc1 ?>" />.
-		<input type="text" name="ip2" size="3" value="<?cs
+		<input type="text" tabindex="1" name="ip2" size="3" value="<?cs
 			var:Data.Plugins.network.ip.oc2 ?>" />.
-		<input type="text" name="ip3" size="3" value="<?cs
-			var:Data.Plugins.network.ip.oc3 ?>" />.
-		<input type="text" name="ip4" size="3" value="<?cs
+		<input type="text" tabindex="2" name="ip3" size="3" value="<?cs
+			var:Data.Plugins.network.3p.oc3 ?>" />.
+		<input type="text" tabindex="4" name="ip4" size="3" value="<?cs
 			var:Data.Plugins.network.ip.oc4 ?>" /></p>
 	
-	<input type="hidden" name="store" value="yes" />
+	<input type="hidden" tabindex="5" name="store" value="yes" />
 
 	<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.Network) ?></button>
 
diff --git a/pythonrewrite/plugins/partition/select_device.cs b/pythonrewrite/plugins/partition/select_device.cs
index 09f4eab..f90a660 100644
--- a/pythonrewrite/plugins/partition/select_device.cs
+++ b/pythonrewrite/plugins/partition/select_device.cs
@@ -9,13 +9,13 @@
 	<?cs call:print_form_header("plugins/partition") ?>
 
 		<p><label for="block_device"><?cs var:html_escape(Lang.Plugins.partition.Text.SelectDevice) ?>: </label><br/>
-		<select name="block_device" id="block_device" size="0">
+		<select name="block_device" id="block_device" tabindex="1" size="0">
 			<?cs each:x = Data.Plugins.partition.BlockDevices
 				?><option><?cs var:html_escape(x) ?></option>
 				<?cs /each ?>
 		</select></p>
 
-		<p><label for="create_config_partition">Create configuration partition?</label><input type="checkbox" name="create_config_partition" value="1" id="create_config_partition" /></p>
+		<p><label for="create_config_partition">Create configuration partition?</label><input type="checkbox" name="create_config_partition" value="1" tabindex="2" id="create_config_partition" /></p>
 		<!--
 		<?cs if:Data.Plugins.partition.CreateConfigPartition ?>
 			<input type="hidden" name="create_config_partition" value="1" />
@@ -28,7 +28,7 @@
 
 		<input type="hidden" name="step" value="add_partition" />
 
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.partition.Button.SelectDevice) ?></button>
+		<button type="submit" tabindex="3"><?cs var:html_escape(Lang.Plugins.partition.Button.SelectDevice) ?></button>
 
 	</form>
 
diff --git a/pythonrewrite/plugins/partition/set_partitions.cs b/pythonrewrite/plugins/partition/set_partitions.cs
index 8e760f1..9c4ca42 100644
--- a/pythonrewrite/plugins/partition/set_partitions.cs
+++ b/pythonrewrite/plugins/partition/set_partitions.cs
@@ -37,11 +37,11 @@
 	<input type="hidden" name="step" value="add_partition" />
 	<?cs set: x = subcount(Data.Plugins.partition.Parts) ?>
 	<td><?cs var:x ?></td>
-	<td><input type="text" name="part<?cs var:x ?>_size" size="8" value="<?cs var:Data.Plugins.partition.availSize ?>" tabindex="0" /></td>
-	<td><select name="part<?cs var:x ?>_type" size="0"><?cs each: t = Data.Plugins.partition.Types ?><option <?cs if:t == "windows" ?>selected="selected"<?cs /if ?>><?cs var:t ?></option>
+	<td><input type="text" name="part<?cs var:x ?>_size" size="8" value="<?cs var:Data.Plugins.partition.availSize ?>" tabindex="1" /></td>
+	<td><select name="part<?cs var:x ?>_type" tabindex="2" size="0"><?cs each: t = Data.Plugins.partition.Types ?><option <?cs if:t == "windows" ?>selected="selected"<?cs /if ?>><?cs var:t ?></option>
 		<?cs /each ?></select></td>
 	<td>
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.partition.Button.AddPartition) ?></button>
+		<button type="submit" tabindex="3"><?cs var:html_escape(Lang.Plugins.partition.Button.AddPartition) ?></button>
 	</td>
 	</form>
 </tr>
diff --git a/pythonrewrite/templates/show_volume.cs b/pythonrewrite/templates/show_volume.cs
index 40dad02..dcd0d3f 100644
--- a/pythonrewrite/templates/show_volume.cs
+++ b/pythonrewrite/templates/show_volume.cs
@@ -11,16 +11,16 @@
 			<p>
 			<?cs if:Data.CurrentDisk.encryption ?>
 				<label for="crypto_passwort"><?cs var:html_escape(Lang.Text.EnterCurrentCryptoPassword) ?></label>
-				<input type="password" id="crypto_password" name="crypto_password" size="20" maxlength="40" />
+				<input type="password" tabindex="1" id="crypto_password" name="crypto_password" size="20" maxlength="40" />
 			<?cs /if ?>
 			<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-			<button type="submit"><?cs var:html_escape(Lang.Button.Mount) ?></button></p>
+			<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Button.Mount) ?></button></p>
 		</form>
 	<?cs else ?>
 		<h2>Unmount container</h2>
 		<?cs call:print_form_header("umount_do") ?>
 			<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-			<button type="submit"><?cs var:html_escape(Lang.Button.Umount) ?></button></p>
+			<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Button.Umount) ?></button></p>
 		</form>
 	<?cs /if ?>
 <?cs /if ?>
@@ -30,9 +30,9 @@
 	<h2>Change the name of the container</h2>
 	<?cs call:print_form_header("volume_name_set") ?>
 		<p><label for="volume_name"><?cs var:html_escape(Lang.Text.ContainerName) ?></label>
-		<input type="text" name="volume_name" size="20" id="volume_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
+		<input type="text" name="volume_name" tabindex="10" size="20" id="volume_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
 		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-		<button type="submit"><?cs var:html_escape(Lang.Button.ContainerNameSet) ?></button></p>
+		<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Button.ContainerNameSet) ?></button></p>
 	</form>
 <?cs /if ?>
 
@@ -41,10 +41,10 @@
 <?cs if:!Data.CurrentDisk.active ?>
 	<h2>Reinitialize container</h2>
 	<?cs call:print_form_header("volume_init_ask") ?>
-		<p><input type="checkbox" name="encryption" id="encryption" value="selected" checked="checked" />
+		<p><input type="checkbox" name="encryption" tabindex="20" id="encryption" value="selected" checked="checked" />
 			<label for="encryption"><?cs var:html_escape(Lang.Text.ContainerEncryption) ?></label>
 		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-		<button type="submit"><?cs var:html_escape(Lang.Button.InitContainer) ?></button></p>
+		<button type="submit" tabindex="21"><?cs var:html_escape(Lang.Button.InitContainer) ?></button></p>
 	</form>
 <?cs /if ?>