diff --git a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
index d1c1289..7d16938 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
@@ -19,7 +19,8 @@
 		<p><label for="confirm"><?cs call:help_popUp(Lang.Text.ConfirmInitHint,'confirm_text') ?><br/>
 			<span class="note" id="confirmtext"><?cs var:Lang.Text.ConfirmInit ?></span></label><br/>
 			<input type="text" id="confirm" name="confirm" size="30" tabindex="3" maxlength="50" /></p>
-		<button type="submit" name="action" value="init_do" tabindex="4"><?cs var:Lang.Button.DoInit ?></button>
+			<input type="hidden" name="action" value="init_do">
+		<button type="submit" tabindex="4"><?cs var:Lang.Button.DoInit ?></button>
 	</form>
 </div>
 
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
index eac05b8..83b7af9 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
@@ -2,14 +2,16 @@
 
 <div align="center">
     <?cs call:print_form_header() ?>
-	
-	<input type="hidden" name="action" value="shutdown_do" />
+		<input type="hidden" name="action" value="shutdown_do" />
+		<input type="hidden" name="type" value="poweroff" />
+		<button type="submit"><?cs var:Lang.Button.PowerOff ?></button>
+	</form>
 
-	<button type="submit" name="type"
-		value="poweroff"><?cs var:Lang.Button.PowerOff ?></button>
 	&nbsp;
-	<button type="submit" name="type"
-		value="reboot"><?cs var:Lang.Button.ReBoot ?></button>
 
+    <?cs call:print_form_header() ?>
+		<input type="hidden" name="action" value="shutdown_do" />
+		<input type="hidden" name="type" value="reboot" />
+		<button type="submit"><?cs var:Lang.Button.ReBoot ?></button>
     </form>
 </div>