diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index f4323f47..2f1bfc50 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -317,11 +317,8 @@ $container->addElement($lamdaemonSettings, true);
 $container->addElement(new htmlSpacer(null, '10px'), true);
 
 
-parseHtml(null, $container, array(), false, $tabindex, 'user');
-
 // LAM Pro settings
 if (isLAMProVersion()) {
-
 	$pwdMailContent = new htmlTable();
 	
 	$pwdMailFrom = new htmlTableExtendedInputField(_('From address'), 'pwdResetMail_from', $conf->getLamProMailFrom(), '550');
@@ -334,80 +331,49 @@ if (isLAMProVersion()) {
 	$pwdMailContent->addElement($pwdMailBody, true);
 	
 	$pwdMailFieldset = new htmlFieldset($pwdMailContent, _("Password mail settings"), '../../graphics/mailBig.png');
-	parseHtml(null, $pwdMailFieldset, array(), true, $tabindex, 'config');
-
-	echo ("<br>\n");
+	$container->addElement($pwdMailFieldset, true);
+	$container->addElement(new htmlSpacer(null, '10px'), true);
 }
 
 // security setings
-echo ("<fieldset><legend><img align=\"middle\" src=\"../../graphics/security.png\" alt=\"security.png\"> " . _("Security settings") . "</legend><br>\n");
-echo ("<table border=0>\n");
+$securitySettingsContent = new htmlTable();
 // login method
-echo ("<tr><td align=\"right\">".
-	_("Login method") . " </td>".
-	"<td><select tabindex=\"$tabindex\" name=\"loginMethod\" onchange=\"configLoginMethodChanged()\">\n");
-if ($conf->getLoginMethod() == LAMConfig::LOGIN_LIST) {
-	echo("<option selected value=" . LAMConfig::LOGIN_LIST . ">" . _('Fixed list') . "</option>\n");
-}
-else {
-	echo("<option value=" . LAMConfig::LOGIN_LIST . ">" . _('Fixed list') . "</option>\n");
-}
-if ($conf->getLoginMethod() == LAMConfig::LOGIN_SEARCH) {
-	echo("<option selected value=" . LAMConfig::LOGIN_SEARCH . ">" . _('LDAP search') . "</option>\n");
-}
-else {
-	echo("<option value=" . LAMConfig::LOGIN_SEARCH . ">" . _('LDAP search') . "</option>\n");
-}
-echo ("</select></td>\n");
-$tabindex++;
-echo "<td>";
-printHelpLink(getHelp('', '220'), '220');
-echo "</td></tr>\n";
+$loginOptions = array(
+	_('Fixed list') => LAMConfig::LOGIN_LIST,
+	_('LDAP search') => LAMConfig::LOGIN_SEARCH
+);
+$loginSelect = new htmlTableExtendedSelect('loginMethod', $loginOptions, array($conf->getLoginMethod()), _("Login method"), '220');
+$loginSelect->setHasDescriptiveElements(true);
+$loginSelect->setOnchangeEvent('configLoginMethodChanged()');
+$securitySettingsContent->addElement($loginSelect, true);
 // admin list
 $adminText = implode("\n", explode(";", $conf->get_Adminstring()));
-echo "<tr id=\"trAdminList\"><td align=\"right\">\n";
-echo _("List of valid users") . " * </td>".
-	"<td><textarea tabindex=\"$tabindex\" name=\"admins\" cols=75 rows=3>" . $adminText . "</textarea></td>\n";
-echo "<td>";
-printHelpLink(getHelp('', '207'), '207');
-echo "</td></tr>\n";
-$tabindex++;
-// login search suffix
-echo "<tr id=\"trLoginSearchSuffix\"><td align=\"right\">\n";
-echo _("LDAP suffix") . " * </td>".
-	"<td><input type=\"text\" tabindex=\"$tabindex\" name=\"loginSearchSuffix\" value=\"" . $conf->getLoginSearchSuffix() . "\"  size=50></td>\n";
-echo "<td>";
-printHelpLink(getHelp('', '221'), '221');
-echo "</td></tr>\n";
-$tabindex++;
+$adminTextInput = new htmlTableExtendedInputTextarea('admins', $adminText, '50', '3', _("List of valid users"), '207');
+$adminTextInput->setRequired(true);
+$securitySettingsContent->addElement($adminTextInput, true);
+// search suffix
+$searchSuffixInput = new htmlTableExtendedInputField(_("LDAP suffix"), 'loginSearchSuffix', $conf->getLoginSearchSuffix(), '221');
+$searchSuffixInput->setRequired(true);
+$securitySettingsContent->addElement($searchSuffixInput, true);
 // login search filter
-echo "<tr id=\"trLoginSearchFilter\"><td align=\"right\">\n";
-echo _("LDAP filter") . " * </td>".
-	"<td><input type=\"text\" tabindex=\"$tabindex\" name=\"loginSearchFilter\" value=\"" . $conf->getLoginSearchFilter() . "\"  size=50></td>\n";
-echo "<td>";
-printHelpLink(getHelp('', '221'), '221');
-echo "</td></tr>\n";
-$tabindex++;
-
-echo ("<tr><td colspan=3>&nbsp;</td></tr>\n");
-
+$searchFilterInput = new htmlTableExtendedInputField(_("LDAP filter"), 'loginSearchFilter', $conf->getLoginSearchFilter(), '221');
+$searchFilterInput->setRequired(true);
+$securitySettingsContent->addElement($searchFilterInput, true);
+$securitySettingsContent->addElement(new htmlSpacer(null, '10px'), true);
 // new password
-echo ("<tr><td align=\"right\"><font color=\"red\">".
-	_("New password") . " </font></td>".
-	"<td align=\"left\"><input tabindex=\"$tabindex\" type=\"password\" name=\"passwd1\"></td>\n");
-$tabindex++;
-echo "<td rowspan=2>";
-printHelpLink(getHelp('', '212'), '212');
-echo "</td></tr>\n";
-// reenter password
-echo ("<tr><td align=\"right\"><font color=\"red\">".
-	_("Reenter password") . " </font></td>".
-	"<td align=\"left\"><input tabindex=\"$tabindex\" type=\"password\" name=\"passwd2\"></td></tr>\n");
-$tabindex++;
-echo ("</table>\n");
-echo ("</fieldset>\n");
+$password1 = new htmlTableExtendedInputField(_("New password"), 'passwd1', null, '212');
+$password1->setIsPassword(true);
+$password2 = new htmlTableExtendedInputField(_("Reenter password"), 'passwd2');
+$password2->setIsPassword(true);
+$securitySettingsContent->addElement($password1, true);
+$securitySettingsContent->addElement($password2, true);
+$securitySettings = new htmlFieldset($securitySettingsContent, _("Security settings"), '../../graphics/security.png');
+$container->addElement($securitySettings, true);
+$container->addElement(new htmlSpacer(null, '10px'), true);
 
-echo ("<p>* = ". _("required") . "</p>");
+$container->addElement(new htmlOutputText('*=' . _("required")), true);
+
+parseHtml(null, $container, array(), false, $tabindex, 'user');
 
 echo ("</div></div></form>\n");
 echo ("</body>\n");
diff --git a/lam/templates/config/moduleSettings.php b/lam/templates/config/moduleSettings.php
index 8891ede0..d956d56e 100644
--- a/lam/templates/config/moduleSettings.php
+++ b/lam/templates/config/moduleSettings.php
@@ -213,7 +213,7 @@ $modules = array_keys($options);
 $_SESSION['conf_types'] = array();
 for ($i = 0; $i < sizeof($modules); $i++) {
 	if (sizeof($options[$modules[$i]]) < 1) continue;
-	echo "<fieldset>\n";
+	echo "<fieldset class=\"ui-corner-all useredit\">\n";
 	$icon = '';
 	$module = new $modules[$i]('none');
 	$iconImage = $module->getIcon();
@@ -221,7 +221,7 @@ for ($i = 0; $i < sizeof($modules); $i++) {
 		$icon = '<img align="middle" src="../../graphics/' . $iconImage . '" alt="' . $iconImage . '"> ';
 	}
 	echo "<legend>$icon<b>" . getModuleAlias($modules[$i], "none") . "</b></legend><br>\n";
-	$configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, true, $tabindex, 'config');
+	$configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, true, $tabindex, 'user');
 	$_SESSION['conf_types'] = array_merge($configTypes, $_SESSION['conf_types']);
 	echo "</fieldset>\n";
 	echo "<br>";
diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js
index 97a326e2..09ac4ef1 100644
--- a/lam/templates/lib/500_lam.js
+++ b/lam/templates/lib/500_lam.js
@@ -3,7 +3,7 @@
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2010  Roland Gruber
+  Copyright (C) 2003 - 2011  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
@@ -120,14 +120,14 @@ function loginProfileChanged(element) {
 function configLoginMethodChanged() {
 	selectLoginMethod = document.getElementsByName('loginMethod')[0];
 	if ( selectLoginMethod.options[selectLoginMethod.selectedIndex].value == 'list' ) {
-		 document.getElementById('trAdminList').style.display = '';
-		 document.getElementById('trLoginSearchSuffix').style.display = 'none';
-		 document.getElementById('trLoginSearchFilter').style.display = 'none';
+		jQuery('textarea[name=admins]').parent().parent().show();
+		jQuery('input[name=loginSearchSuffix]').parent().parent().hide();
+		jQuery('input[name=loginSearchFilter]').parent().parent().hide();
 	}
 	else {
-		 document.getElementById('trAdminList').style.display = 'none';
-		 document.getElementById('trLoginSearchSuffix').style.display = '';
-		 document.getElementById('trLoginSearchFilter').style.display = '';
+		jQuery('textarea[name=admins]').parent().parent().hide();
+		jQuery('input[name=loginSearchSuffix]').parent().parent().show();
+		jQuery('input[name=loginSearchFilter]').parent().parent().show();
 	}
 }