diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php
index f029b935..d3fdee2e 100644
--- a/lam/templates/config/conflogin.php
+++ b/lam/templates/config/conflogin.php
@@ -19,11 +19,20 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-  Login page to change the preferences.
 */
 
+
+/**
+* Login page to change the preferences.
+*
+* @package configuration
+* @author Roland Gruber
+*/
+
+
+/** Access to config functions */
 include_once('../../lib/config.inc');
+/** Used to print status messages */
 include_once('../../lib/status.inc');
 
 // start session
diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 9ddb5c28..d6959fde 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -19,11 +19,18 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-
-
 */
 
+
+/**
+* Main page of configuration
+*
+* @package configuration
+* @author Roland Gruber
+*/
+
+
+/** Access to config functions */
 include_once ("../../lib/config.inc");
 
 // start session
@@ -90,11 +97,11 @@ if ($_GET["modulesback"] == "true") $passwd = $_SESSION['conf_passwd'];
 // if not: load login page
 if (! $passwd) {
 	$message = _("No password was entered!");
+	/** go back to login if password is empty */
 	require('conflogin.php');
 	exit;
 }
 
-include_once ('../../lib/config.inc');
 $filename = $_POST['filename'];
 if ($_GET["modulesback"] == "true") $filename = $_SESSION['conf_filename'];
 $conf = new Config($filename);
@@ -103,6 +110,7 @@ $conf = new Config($filename);
 // if not: load login page
 if (!(($conf->get_Passwd()) == $passwd)) {
 	$message = _("The password is invalid! Please try again.");
+	/** go back to login if password is invalid */
 	require('conflogin.php');
 	exit;
 }
diff --git a/lam/templates/config/confmodules.php b/lam/templates/config/confmodules.php
index 4f029649..2d59024d 100644
--- a/lam/templates/config/confmodules.php
+++ b/lam/templates/config/confmodules.php
@@ -19,11 +19,20 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-  confmodules lets the user select the account modules
-
 */
+
+
+ /**
+* confmodules lets the user select the account modules
+*
+* @package configuration
+* @author Roland Gruber
+*/
+
+
+/** Access to config functions */
 include_once ('../../lib/config.inc');
+/** Access to module lists */
 include_once ('../../lib/modules.inc');
 
 // start session
@@ -38,6 +47,7 @@ $passwd = $_SESSION['conf_passwd'];
 // check if password is correct
 // if not: load login page
 if ($passwd != $conf->get_Passwd()) {
+	/** go back to login if password is invalid */
 	require('conflogin.php');
 	exit;
 }
diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php
index 76dca9fd..0c2d4829 100644
--- a/lam/templates/config/confsave.php
+++ b/lam/templates/config/confsave.php
@@ -19,10 +19,18 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-  confsave saves the new preferences to lam.conf
-
 */
+
+
+/**
+* confsave saves the new preferences to lam.conf
+*
+* @package configuration
+* @author Roland Gruber
+*/
+
+
+/** Access to config functions */
 include_once ('../../lib/config.inc');
 
 // start session
@@ -64,6 +72,7 @@ $filename = $_SESSION['conf_filename'];
 // check if password is correct
 // if not: load login page
 if ($passwd != $conf->get_Passwd()) {
+	/** go back to login if password is invalid */
 	require('conflogin.php');
 	exit;
 }
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index ca499241..0828351f 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -19,11 +19,20 @@ $Id$
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-
-  Configuration profile management.
 */
 
+  
+/**
+* Configuration profile management.
+*
+* @package configuration
+* @author Roland Gruber
+*/
+
+
+/** Access to config functions */
 include_once('../../lib/config.inc');
+/** Used to print status messages */
 include_once('../../lib/status.inc');
 
 // start session