diff --git a/lam/index.php b/lam/index.php
new file mode 100644
index 00000000..3119b57a
--- /dev/null
+++ b/lam/index.php
@@ -0,0 +1,28 @@
+<?php
+/*
+$Id$
+
+  This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+  Copyright (C) 2003  Tilo Lutz
+
+  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
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+  LDAP Account Manager, Forward to startfile
+*/
+
+include('templates/login.php'); // Startpage
+
+?>
diff --git a/lam/templates/account.php b/lam/templates/account.php
index a57dae3f..a2aa6631 100644
--- a/lam/templates/account.php
+++ b/lam/templates/account.php
@@ -26,6 +26,7 @@ $Id$
 include_once('../lib/account.inc'); // File with custom functions
 include_once('../lib/config.inc');
 include_once('../lib/ldap.inc');
+include_once('../lib/profiles.inc');
 
 registervars(); // Register all needed variables in session and register session
 $error = "0";
@@ -236,6 +237,8 @@ if ($backmain) {
 	$_SESSION['account_old']="";
 	}
 
+if ($load) $select='load';
+if ($save) $select='save';
 
 
 
@@ -319,7 +322,9 @@ switch ($select) {
 					if ( $_SESSION['account']->general_shell == '/usr/bin/zsh' ) echo '<option selected> /usr/bin/zsh'; else echo '<option> /usr/bin/zsh';
 				echo	'</select></td><td>';
 				echo _('To disable login use /bin/false.');
-				echo '</td></tr>';
+				echo '</td></tr><tr><td>
+				<input name="load" type="submit" value="'; echo _('Load Profile'); echo '">
+				</td><td>';
 				break;
 			case 'group':
 				echo '<tr><td>';
@@ -374,12 +379,12 @@ switch ($select) {
 				echo '</td><td><input name="f_general_gecos" type="text" size="30" value="' . $_SESSION['account']->general_gecos . '">
 					</td><td>';
 				echo _('Host descriptopn. If left empty hostname will be used.');
-				echo '</td></tr>';
+				echo '</td></tr><tr><td>
+				<input name="load" type="submit" value="'; echo _('Load Profile'); echo '">
+				</td><td>';
 				break;
 			}
-		echo '<tr><td>
-		<input name="load" type="submit" value="'; echo _('Load Profile'); echo '">
-		</td><td></td><td>
+		echo '</td><td>
 		<input name="next" type="submit" value="'; echo _('next'); echo '">
 		</td></tr>';
 		break;
@@ -743,9 +748,13 @@ switch ($select) {
 			}
 		echo '<tr><td>';
 		echo '<input name="back" type="submit" value="'; echo _('back'); echo '">
-		</td><td>
-		<input name="save" type="submit" value="'; echo _('Save Profile'); echo '">
-		</td><td>
+		</td><td>';
+		if (($_SESSION['type2']=='user') || ($_SESSION['type2']=='host')) {
+			echo '<input name="save" type="submit" value="';
+			echo _('Save Profile');
+			echo '">';
+			}
+		echo '</td><td>
 		<input name="create" type="submit" value="'; echo _('Create Account'); echo '">
 		</td></tr>';
 		break;
@@ -809,6 +818,26 @@ switch ($select) {
 				break;
 			}
 		break;
+	case 'load':
+		switch ( $_SESSION['type2'] ) {
+			case 'user':
+				print_r (getUserProfiles());
+			break;
+			case 'host':
+				print_r (getHostProfiles());
+			break;
+			}
+		break;
+	case 'save':
+		switch ( $_SESSION['type2'] ) {
+			case 'user':
+				print_r (getUserProfiles());
+			break;
+			case 'host':
+				print_r (getUserProfiles());
+			break;
+			}
+		break;
 	}
 
 // Print end of HTML-Page