diff --git a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
index dd815c3..8c632ce 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
@@ -22,8 +22,8 @@
 		    <?cs /each ?>
 		</select></p>
 
-	<button type="submit" name="action" value="config_do">
-		    <?cs var:Lang.Button.SaveConfig ?></button>
+	<input type="hidden" name="action" value="config_do" />
+	<button type="submit"><?cs var:Lang.Button.SaveConfig ?></button>
 
     </form>
 </div>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
index 5e9eb34..98741ea 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -6,7 +6,8 @@
 	<p><label for="crypto_passwort"><?cs var:Lang.Text.EnterCurrentCryptoPassword ?></label>
 	    <input type="password" id="crypto_password" name="crypto_password" size="20" tabindex="0" maxlength="40" /></p>
 
-	<button type="submit" name="action" value="mount_do"><?cs var:Lang.Button.Mount ?></button>
+		<input type="hidden" name="action" value="mount_do" />
+	<button type="submit" ><?cs var:Lang.Button.Mount ?></button>
 
     </form>
 </div>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
index c127040..8365374 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
@@ -3,8 +3,8 @@
 <div align="center">
     <?cs call:print_form_header() ?>
 
-	<button type="submit" name="action"
-		value="umount_do"><?cs var:Lang.Button.Umount ?></button>
+	<input type="hidden" name="action" value="umount_do" />
+	<button type="submit"><?cs var:Lang.Button.Umount ?></button>
 
     </form>
 </div>