diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index 174fd1f1..21c6a436 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -88,15 +88,18 @@ echo $_SESSION['header'];
 				echo "<script type=\"text/javascript\" src=\"../lib/" . $jsEntry . "\"></script>\n";
 			}
 			// set focus on password field
-			echo "<script type=\"text/javascript\" language=\"javascript\">\n";
-			echo "<!--\n";
-			echo "window.onload = function() {\n";
-				echo "loginField = document.getElementsByName('passwd')[0];\n";
-				echo "loginField.focus();\n";
-			echo "}\n";
-			echo "//-->\n";
-			echo "</script>\n";
-		?>
+			?>
+			<script type="text/javascript" language="javascript">
+			<!--
+			window.onload = function() {
+				loginField = document.getElementsByName('passwd')[0];
+				loginField.focus();
+			}
+			jQuery(document).ready(function() {
+				jQuery('#submitButton').button();
+			});
+			//-->
+			</script>
 		<table border=0 width="100%" class="lamHeader ui-corner-all">
 			<tr>
 				<td align="left" height="30">
@@ -152,8 +155,8 @@ echo $_SESSION['header'];
 						else echo "<select disabled size=1 name=\"filename\">\n<option></option>\n</select>\n";
 						if (sizeof($files) > 0) echo "<input type=\"password\" name=\"passwd\">\n";
 						else echo "<input disabled type=\"password\" name=\"passwd\">\n";
-						if (sizeof($files) > 0) echo "<input type=\"submit\" name=\"submit\" value=\"" . _("Ok") . "\">\n";
-						else echo "<input disabled type=\"submit\" name=\"submit\" value=\"" . _("Ok") . "\">&nbsp;\n";
+						if (sizeof($files) > 0) echo "<button id=\"submitButton\" class=\"smallPadding\" name=\"submit\">" . _("Ok") . "</button>\n";
+						else echo "<button id=\"submitButton\" class=\"smallPadding\" name=\"submit\" disabled>" . _("Ok") . "</button>&nbsp;\n";
 						// help link
 						printHelpLink(getHelp('', '200'), '200');
 					?>
diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php
index e3048aa9..bcc78422 100644
--- a/lam/templates/config/mainlogin.php
+++ b/lam/templates/config/mainlogin.php
@@ -152,9 +152,14 @@ echo $_SESSION['header'];
 				<td style="border-style:none" rowspan="3" width="20"></td>
 				<td style="border-style:none" align="center">
 					<input type="password" name="passwd">
-					<input type="submit" name="submit" value="<?php echo _("Ok"); ?>">
+					<button id="submitButton" class="smallPadding" name="submit"><?php echo _("Ok"); ?></button>
 					&nbsp;
 					<?php printHelpLink(getHelp('', '236'), '236'); ?>
+					<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						jQuery('#submitButton').button();
+					});
+					</script>
 				</td>
 				<td style="border-style:none" rowspan="3" width="20"></td>
 			</tr>
diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index cc5d6792..9945bd86 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -189,7 +189,7 @@ if (!$cfg->isWritable()) {
 		<table border="0" align="center">
 		<tr><td>
 		<fieldset>
-			<legend><b> <?php echo _("Security settings"); ?> </b></legend>
+			<legend> <?php echo _("Security settings"); ?> </legend>
 			<br>
 			<table cellspacing="0" border="0">
 				<!-- session timeout -->
@@ -236,7 +236,7 @@ if (!$cfg->isWritable()) {
 		</fieldset>
 		<BR>
 		<fieldset>
-			<legend><b> <?php echo _("Password policy"); ?> </b></legend>
+			<legend> <?php echo _("Password policy"); ?> </legend>
 			<br>
 			<table cellspacing="0" border="0">
 			<?php
@@ -275,7 +275,7 @@ if (!$cfg->isWritable()) {
 		</fieldset>
 		<BR>
 		<fieldset>
-			<legend><b> <?php echo _("Logging"); ?> </b></legend>
+			<legend> <?php echo _("Logging"); ?> </legend>
 			<br>
 			<table cellspacing="0" border="0">
 				<!-- log level -->
@@ -359,7 +359,7 @@ if (!$cfg->isWritable()) {
 		</fieldset>
 		<BR>
 		<fieldset>
-			<legend><b> <?php echo _("Change master password"); ?> </b></legend>
+			<legend> <?php echo _("Change master password"); ?> </legend>
 			<br>
 			<table cellspacing="0" border="0">
 				<!-- set master password -->
@@ -393,9 +393,15 @@ if (!$cfg->isWritable()) {
 				<TD>
 					<BR>
 					<?php if ($cfg->isWritable()) { ?>
-					<input type="submit" name="submit" value=" <?php echo _("Ok"); ?> ">
+					<button id="submitButton" name="submit" class="smallPadding"><?php echo _("Ok"); ?></button>
 					<?php } ?>
-					<input type="submit" name="cancel" value=" <?php echo _("Cancel"); ?> ">
+					<button id="cancelButton" name="cancel" class="smallPadding"><?php echo _("Cancel"); ?></button>
+					<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						jQuery('#submitButton').button();
+						jQuery('#cancelButton').button();
+					});
+					</script>
 				</TD>
 			</TR>
 			</table>
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index cfddcadd..9032c7fc 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -92,7 +92,7 @@ foreach ($jsFiles as $jsEntry) {
 
 $cfg = new LAMCfgMain();
 // check if submit button was pressed
-if ($_POST['submit']) {
+if (isset($_POST['submit'])) {
 	// check master password
 	if (!$cfg->checkPassword($_POST['passwd'])) {
 		$error = _("Master password is wrong!");
@@ -379,11 +379,16 @@ if (!isset($cfg->default)) {
 			&nbsp;
 			<input type="password" name="passwd">
 			&nbsp;
-			<input type="submit" name="submit" value=" <?php echo _("Ok"); ?> ">
+			<button id="submitButton" name="submit" class="smallPadding"><?php echo _("Ok"); ?></button>
 			&nbsp;
 			<?PHP
 				printHelpLink(getHelp('', '236'), '236');
 			?>
+			<script type="text/javascript" language="javascript">
+			jQuery(document).ready(function() {
+				jQuery('#submitButton').button();
+			});
+			</script>
 
 		</form>
 		<p><br></p>