diff --git a/lam/lam.conf b/lam/lam.conf
index 5d1498e9..3c5400bf 100644
--- a/lam/lam.conf
+++ b/lam/lam.conf
@@ -1,4 +1,4 @@
-# LDAP Account Manager configuration 
+# LDAP Account Manager configuration
 
 # hostname of LDAP server (e.g localhost)
 host: localhost
@@ -12,7 +12,7 @@ ssl: False
 # list of users who are allowed to use LDAP Account Manager
 # names have to be seperated by semicolons
 # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org
-admins: cn=admin,o=test,c=de;uid=testuser,o=test,c=de
+admins: cn=admin,o=test,c=de;uid=testuser,o=test,c=de;cn=Manager,dc=home,dc=duergner
 
 # password to change these preferences via webfrontend
 passwd: lam
diff --git a/lam/templates/login.inc b/lam/templates/login.inc
index cbdaf8a1..ea5db84b 100755
--- a/lam/templates/login.inc
+++ b/lam/templates/login.inc
@@ -67,17 +67,17 @@ else
 		<input type="hidden" name="action" value="checklogin">
 			<table width="500" align="center" border="0">
 				<tr>
-					<td width="45%" align="right"><? echo _("Username:") ?></td><td width="10%"></td><td width="45%" align="left"><input type="text" name="username"></td>
+					<td width="45%" align="right"><? echo _("Username:") ?></td><td width="10%"></td><td width="45%" align="left"><select name="username" size="1"><? for($i = 0; $i < count($config->Admins); $i++) { $text = explode(",", $config->Admins[$i]); $text = explode("=", $text[0]); echo "<option value=\"" . $config->Admins[$i] . "\">" . $text[1] . "</option>"; } ?></select></td>
 				</tr>
 				<tr>
 					<td width="45%" align="right"><? echo _("Password:") ?></td><td width="10%"></td><td width="45%" align="left"><input type="password" name="passwd"></td>
 				</tr>
 				<tr>
-<? if($message != "") { ?>
+					<? if($message != "") { ?>
 					<td width="100%" colspan="3" align="center"><? echo _($message) ?><input type="hidden" name="language" value="english"></td>
-<? } else { ?>
+					<? } else { ?>
 					<td width="45%" align="right"><? echo _("Your Language:") ?></td><td width="10%"></td><td width="45%" align="left"><select name="language" size="1"><? for($i = 0; $i < count($languages); $i++) { echo "<option value=\"" . $languages[$i]["link"] . "\">" . $languages[$i]["descr"] . "</option>"; } ?></select></td>
-<? } ?>
+					<? } ?>
 				</tr>
 				<tr>
 					<td width="100%" colspan="3" align="center"><input type="submit" name="submit" value=<? echo _("Login"); ?>></td>
diff --git a/lam/templates/login.php b/lam/templates/login.php
index b92c5325..205754ab 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -22,23 +22,26 @@ $Id$
 
   LDAP Account Manager checking login data.
 */
-// including ldap.php which provides basic ldap functions
+
+// Starting LDAP Account Manager session
 session_name("LDAP Account Manager");
 session_start();
 
+// including ldap.php which provides basic ldap functions
 include_once("../lib/ldap.php");
 
+$config = new Config; // Creating new Config object
+session_register($config); // Register $config object in session
+
 // checking if the submitted username/password is correct.
 if($action == "checklogin")
 {
-	$config = new Config;
-	$ldap = new Ldap($config);
+	$ldap = new Ldap($config); // Creating new Ldap object
 	$result = $ldap->connect($username,$passwd);
 	if($result == True) // Username/password correct. Doing some configuration and loading main Frame.
 	{
-		session_register($ldap); // register $ldap object in session
-		session_register($config); // register $config object in session
-		session_register($language); // register $language in session
+		session_register($ldap); // Register $ldap object in session
+		session_register($language); // Register $language in session
 
 		// setting language
 		$language = explode(":", $language);