diff --git a/call.inc.php b/call.inc.php
index 9ff82a5f..85c12bff 100644
--- a/call.inc.php
+++ b/call.inc.php
@@ -79,5 +79,8 @@ if ($in) {
 	echo "</table>\n";
 }
 ?>
-<p><input type="hidden" name="token" value="<?php echo $token; ?>" /><input type="submit" value="<?php echo lang('Call'); ?>" /></p>
+<p>
+<input type="hidden" name="token" value="<?php echo $token; ?>" />
+<input type="submit" value="<?php echo lang('Call'); ?>" />
+</p>
 </form>
diff --git a/database.inc.php b/database.inc.php
index cd0549c7..19790b62 100644
--- a/database.inc.php
+++ b/database.inc.php
@@ -45,10 +45,12 @@ if ($_POST) {
 }
 ?>
 
-<form action="" method="post"><p>
+<form action="" method="post">
+<p>
 <input name="name" value="<?php echo htmlspecialchars($name); ?>" maxlength="64" />
 <select name="collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist(collations(), $collate, "not_vals"); ?></select>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 <?php if (strlen($_GET["db"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" /><?php } ?>
-</p></form>
+</p>
+</form>
diff --git a/indexes.inc.php b/indexes.inc.php
index d0d36c56..12b9450e 100644
--- a/indexes.inc.php
+++ b/indexes.inc.php
@@ -67,7 +67,8 @@ foreach ($row["indexes"] as $index) {
 <tr><td><select name="indexes[<?php echo $j; ?>][type]"><option></option><?php echo optionlist($index_types, array(), "not_vals"); ?></select></td><td><select name="indexes[<?php echo $j; ?>][columns][1]"><option></option><?php echo optionlist($fields, array(), "not_vals"); ?></select></td></tr>
 </table>
 <p>
-<input type="hidden" name="token" value="<?php echo $token; ?>" /><input type="submit" value="<?php echo lang('Alter indexes'); ?>" />
+<input type="hidden" name="token" value="<?php echo $token; ?>" />
+<input type="submit" value="<?php echo lang('Alter indexes'); ?>" />
 <input type="submit" name="add" value="<?php echo lang('Add next'); ?>" />
 </p>
 </form>