diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 415af9f6..b8a47691 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -37,6 +37,9 @@ h1,h2,h3 { color:black; }
 
 body {
   background-color:#F5F5F5;
+}
+
+body.selfservice {
   padding: 10px;
 }
 
@@ -81,9 +84,9 @@ a.classicBold {
 }
 
 fieldset {
-background-color:#fff3c8;
-border:1px solid #af8800;
-padding:10px;
+  background-color:#fff3c8;
+  border:1px solid #af8800;
+  padding:10px;
 }
 
 div.filled {
@@ -127,8 +130,8 @@ input {
 table.lamHeader {
   background-image: url(lam-images/headerLine.png);
   padding: 0px;
-  margin: 0px;
   height: 35px;
+  margin: 0px;
 }
 
 /* table preferences */
@@ -296,14 +299,14 @@ td.loginLogo {
 	width: 65px;
 }
 
-div.roundedShadowBox {
-	border:2px solid #a0a0a4;
-	border-radius:5px;
+.roundedShadowBox {
+	border: 2px solid #a0a0a4;
+	border-radius: 5px;
 	box-shadow: 2px 2px 5px #a0a0a4;
 	display: inline-block;
 	background-color: white;
 	padding: 20px;
-	max-width: 575px;
+	max-width: 580px;
 }
 
 div.centeredTable {
diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index ba468ce6..1a3e6a63 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2014  Roland Gruber
+  Copyright (C) 2003 - 2015  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ echo $_SESSION['header'];
 				echo _("Login");
 			?>
 		</title>
-	<?php 
+	<?php
 		// include all CSS files
 		$cssDirName = dirname(__FILE__) . '/../../style';
 		$cssDir = dir($cssDirName);
@@ -122,7 +122,7 @@ echo $_SESSION['header'];
 		<!-- form to change existing profiles -->
 		<form action="confmain.php" method="post" autocomplete="off">
 		<table align="center"><tr><td>
-		<table align="center" border="2" rules="none" bgcolor="white" class="ui-corner-all">
+		<table align="center" border="0" rules="none" bgcolor="white" class="ui-corner-all roundedShadowBox">
 			<tr>
 				<td style="border-style:none" rowspan="3" width="20"></td>
 				<td style="border-style:none" height="20"></td>
diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php
index 1f94d362..3bfc68a4 100644
--- a/lam/templates/config/mainlogin.php
+++ b/lam/templates/config/mainlogin.php
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2014  Roland Gruber
+  Copyright (C) 2003 - 2015  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ echo $_SESSION['header'];
 				echo _("Login");
 			?>
 		</title>
-	<?php 
+	<?php
 		// include all CSS files
 		$cssDirName = dirname(__FILE__) . '/../../style';
 		$cssDir = dir($cssDirName);
@@ -137,7 +137,7 @@ echo $_SESSION['header'];
 		<form action="mainlogin.php" method="post" autocomplete="off">
 		<table align="center">
 		<tr><td>
-		<table align="center" border="2" rules="none" bgcolor="white" class="ui-corner-all" style="padding: 20px;">
+		<table align="center" border="0" rules="none" bgcolor="white" class="ui-corner-all roundedShadowBox" style="padding: 20px;">
 		<tr><td>
 		<?php
 		$spacer = new htmlSpacer('20px', '20px');
@@ -166,8 +166,8 @@ echo $_SESSION['header'];
 		$passwordGroup->addElement($gap);
 		$passwordGroup->addElement(new htmlHelpLink('236'));
 		$table->addElement($passwordGroup, true);
-		
-		
+
+
 		$tabindex = 1;
 		parseHtml(null, $table, array(), false, $tabindex, 'user');
 		?>
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 8c60f767..5748d8e6 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -4,7 +4,7 @@ $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
   Copyright (C) 2003 - 2006  Michael Duergner
-                2005 - 2014  Roland Gruber
+                2005 - 2015  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -169,7 +169,7 @@ function display_LoginPage($config_object, $cfgMain) {
 		setcookie("Key", base64_encode($key), 0, "/");
 		setcookie("IV", base64_encode($iv), 0, "/");
 	}
-	
+
 	$profiles = getConfigProfiles();
 
 	setlanguage(); // setting correct language
@@ -177,7 +177,7 @@ function display_LoginPage($config_object, $cfgMain) {
 	echo $_SESSION["header"];
 	?>
 		<title>LDAP Account Manager</title>
-	<?php 
+	<?php
 		// include all CSS files
 		$cssDirName = dirname(__FILE__) . '/../style';
 		$cssDir = dir($cssDirName);
@@ -210,7 +210,7 @@ function display_LoginPage($config_object, $cfgMain) {
 	foreach ($jsFiles as $jsEntry) {
 		echo "<script type=\"text/javascript\" src=\"lib/" . $jsEntry . "\"></script>\n";
 	}
-	
+
 	// upgrade if pdf/profiles contain single files
 	if (containsFiles('../config/profiles') || containsFiles('../config/pdf')) {
 		$result = testPermissions();
@@ -224,7 +224,7 @@ function display_LoginPage($config_object, $cfgMain) {
 	}
 	// copy any missing default profiles
 	copyConfigTemplates($profiles);
-	
+
 	// set focus on password field
 	if (!empty($config_object)) {
 		echo "<script type=\"text/javascript\" language=\"javascript\">\n";
@@ -266,7 +266,7 @@ function display_LoginPage($config_object, $cfgMain) {
 			</td>
 			</tr>
 		</table>
-		
+
 		<br><br>
 
 		<?php
@@ -318,15 +318,16 @@ function display_LoginPage($config_object, $cfgMain) {
 		if (!empty($config_object)) {
 		?>
 		<br><br>
-		<div style="position:relative; z-index:5;">
-		<table align="center" border="2" rules="none" bgcolor="white" class="ui-corner-all">
+		<div class="centeredTable">
+		<div class="roundedShadowBox" style="position:relative; z-index:5;">
+		<table align="center" border="0" rules="none" bgcolor="white" class="ui-corner-all">
 			<tr>
 				<td class="loginLogo" style="border-style:none" rowspan="2">
 				</td>
-				<td style="border-style:none" width="580px">
+				<td style="border-style:none">
 					<form action="login.php" method="post">
 						<?php
-							$table = new htmlTable('580px');
+							$table = new htmlTable('500px');
 							$spacer = new htmlSpacer(null, '30px');
 							$spacer->colspan = 3;
 							$table->addElement($spacer, true);
@@ -439,7 +440,7 @@ function display_LoginPage($config_object, $cfgMain) {
 								$message->colspan = 3;
 								$table->addElement($message, true);
 							}
-							
+
 							$tabindex = 1;
 							parseHtml(null, $table, array(), false, $tabindex, 'user');
 						?>
@@ -450,7 +451,7 @@ function display_LoginPage($config_object, $cfgMain) {
 				<td align="left" style="border-style:none">
 					<form action="login.php" method="post">
 					<?php
-						$table = new htmlTable('580px');
+						$table = new htmlTable();
 						$line = new htmlHorizontalLine();
 						$line->colspan = 2;
 						$table->addElement($line, true);
@@ -483,6 +484,7 @@ function display_LoginPage($config_object, $cfgMain) {
 			</tr>
 		</table>
 		</div>
+		</div>
 		<?php
 		}
 		?>
@@ -522,7 +524,7 @@ if(!empty($_POST['checklogin'])) {
 	include_once("../lib/ldap.inc"); // Include ldap.php which provides Ldap class
 
 	$_SESSION['ldap'] = new Ldap($_SESSION['config']); // Create new Ldap object
-	
+
 	$clientSource = $_SERVER['REMOTE_ADDR'];
 	if (isset($_SERVER['REMOTE_HOST'])) {
 		$clientSource .= '/' . $_SERVER['REMOTE_HOST'];