diff -uNr ameos_feuser_mgr-1.1.0-org/conf/users.xml ameos_feuser_mgr/conf/users.xml
--- ameos_feuser_mgr-1.1.0-org/conf/users.xml	2009-05-02 17:36:19.000000000 +0200
+++ ameos_feuser_mgr/conf/users.xml	2009-05-02 20:21:38.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<formidable version="0.6.0">
-	
+<formidable version="2.0.345">
+
 	<meta>
 		<name>User form</name>
 		<form formid="userform" />
@@ -14,6 +14,21 @@
 			<tablename>fe_users</tablename>
 			<keyname>uid</keyname>
 			<labelname>username</labelname>
+			<process>
+				<beforeInsertion>
+					<userobj>
+						<php><![CDATA[
+							// create
+							// adding pid, crdate and tstamp
+							$aData = $this->getParams();	
+							$aData["pid"] = $this->_oParent->flexConf["plugin_userpid"];
+							$aData["crdate"] = time();
+							$aData["tstamp"] = time();
+							return $aData;
+						]]></php>
+					</userobj>
+				</beforeInsertion>
+			</process>
 		</datahandler:DB>
 		
 		<renderer:TEMPLATE>
@@ -32,6 +47,7 @@
 	</control>
 
 	<elements>
+
 		<renderlet:TEXT name="username">
 			<label>LLL:EXT:ameos_feuser_mgr/pi1/locallang.php:user.form.username.label</label>
 			<validators>
@@ -129,13 +145,13 @@
 			</validators>
 		</renderlet:TEXT>
 
-		<renderlet:FILE name="image">
+		<renderlet:UPLOAD name="image">
 			<label>LLL:EXT:ameos_feuser_mgr/pi1/locallang.php:user.form.image.label</label>
 			<data>
 				<targetdir>uploads/pics/</targetdir>
 			</data>
-		</renderlet:FILE>
-
+		</renderlet:UPLOAD>
+		
 		<renderlet:CHECKBOX name="usergroup">
 			<label>LLL:EXT:ameos_feuser_mgr/pi1/locallang.php:user.form.usergroup.label</label>
 			<data>
@@ -197,4 +213,4 @@
 
 	</elements>
 
-</formidable>
\ Kein Zeilenumbruch am Dateiende.
+</formidable>
diff -uNr ameos_feuser_mgr-1.1.0-org/flexform_ds_pi1.xml ameos_feuser_mgr/flexform_ds_pi1.xml
--- ameos_feuser_mgr-1.1.0-org/flexform_ds_pi1.xml	2009-05-02 17:36:19.000000000 +0200
+++ ameos_feuser_mgr/flexform_ds_pi1.xml	2009-08-26 16:31:08.000000000 +0200
@@ -47,6 +47,17 @@
 				</TCEforms>
 			</plugin_userpid>
 
+			<plugin_templatepath>
+				<TCEforms>
+					<label>LLL:EXT:ameos_feuser_mgr/locallang_db.php:tt_content.pi_flexform.templates_path</label>
+					<config>
+				        	<type>input</type>
+				        	<size>150</size>
+						<default></default>
+					</config>
+				</TCEforms>
+			</plugin_templatepath>						
+
 		</el>
 	</ROOT>
-</T3DataStructure>
\ Kein Zeilenumbruch am Dateiende.
+</T3DataStructure>
diff -uNr ameos_feuser_mgr-1.1.0-org/locallang_db.php ameos_feuser_mgr/locallang_db.php
--- ameos_feuser_mgr-1.1.0-org/locallang_db.php	2009-05-02 17:36:19.000000000 +0200
+++ ameos_feuser_mgr/locallang_db.php	2009-08-26 17:01:08.000000000 +0200
@@ -17,10 +17,10 @@
 		'tt_content.pi_flexform.onglet_general' => 'General Settings',
 		'tt_content.pi_flexform.onglet_display' => 'Display Settings',
 		'tt_content.pi_flexform.users_pid' => 'Users storage folder',
+		'tt_content.pi_flexform.templates_path' => 'templates path (relative)',
 		'tt_content.pi_flexform.plugin_mode' => 'Plugin mode',
 		'tt_content.pi_flexform.plugin_mode_groups' => 'Groups',
 		'tt_content.pi_flexform.plugin_mode_users' => 'Users',
-		'tt_content.pi_flexform.template_file' => 'Template file (.html)',
 		'tt_content.pi_flexform.css_files' => 'Style files (.css)',
 		
 		'fe_users.tx_ameosfeusermanager_validfrom' => 'Valid From',
@@ -33,10 +33,10 @@
 		'tt_content.pi_flexform.onglet_general' => 'Allgemeine Einstellungen',
 		'tt_content.pi_flexform.onglet_display' => 'Anzeige Einstellungen',
 		'tt_content.pi_flexform.users_pid' => 'Benutzer-Ordner',
+		'tt_content.pi_flexform.templates_path' => 'Template-Pfad (relativ)',
 		'tt_content.pi_flexform.plugin_mode' => 'Plugin mode',
 		'tt_content.pi_flexform.plugin_mode_groups' => 'Gruppen',
 		'tt_content.pi_flexform.plugin_mode_users' => 'Benutzer',
-		'tt_content.pi_flexform.template_file' => 'Template Datei (.html)',
 		'tt_content.pi_flexform.css_files' => 'Style Datei (.css)',
 	),
 	'no' => Array (
@@ -48,10 +48,10 @@
 		'tt_content.pi_flexform.onglet_general' => 'Configuration générale',
 		'tt_content.pi_flexform.onglet_display' => 'Options d\'affichage',
 		'tt_content.pi_flexform.users_pid' => 'Dossier de stockage des utilisateurs',
+		'tt_content.pi_flexform.templates_path' => 'répertoire de gabarites (relative)',
 		'tt_content.pi_flexform.plugin_mode' => 'Mode du Plugin',
 		'tt_content.pi_flexform.plugin_mode_groups' => 'Groupes',
 		'tt_content.pi_flexform.plugin_mode_users' => 'Utilisateurs',
-		'tt_content.pi_flexform.template_file' => 'Fichier de gabarit (.html)',
 		'tt_content.pi_flexform.css_files' => 'Fichier(s) de style (.css)',
 	),
 	'es' => Array (
diff -uNr ameos_feuser_mgr-1.1.0-org/pi1/class.tx_ameosfeusermgr_pi1.php ameos_feuser_mgr/pi1/class.tx_ameosfeusermgr_pi1.php
--- ameos_feuser_mgr-1.1.0-org/pi1/class.tx_ameosfeusermgr_pi1.php	2009-05-02 17:36:19.000000000 +0200
+++ ameos_feuser_mgr/pi1/class.tx_ameosfeusermgr_pi1.php	2009-08-26 16:48:02.000000000 +0200
@@ -72,6 +72,13 @@
 		// on traite l'inclusion des css
 		
 		$cssPath = t3lib_extMgm::siteRelPath($this->extKey) . "pi1/templates/style.css";
+
+		if (array_key_exists("plugin_templatepath", $this->flexConf) and !empty($this->flexConf["plugin_templatepath"])) {
+		       	$tempCssPath = t3lib_div::getFileAbsFileName( $this->flexConf["plugin_templatepath"] . "style.css");
+			if (file_exists( $tempCssPath ) && is_readable($tempCssPath))
+				$cssPath = $this->flexConf["plugin_templatepath"] . "style.css";
+		}
+
 		$headerData = "<link href=\"" . $cssPath . "\" rel=\"stylesheet\" type=\"text/css\">\n";
 		$GLOBALS['TSFE']->additionalHeaderData[] = $headerData;
 
@@ -96,6 +103,7 @@
 
 			if(!array_key_exists("plugin_userpid", $this->flexConf) || trim($this->flexConf["plugin_userpid"]) == "" || !is_numeric($this->flexConf["plugin_userpid"]))
 			{ $error = true;}
+
 		}
 		else
 		{ $error = true;}
@@ -403,7 +411,8 @@
 	}
 	
 	
-	function _populateGroups($aItems, $aParams, $oForm)
+//	function _populateGroups($aItems, $aParams, $oForm)
+	function _populateGroups($aParams, $oForm)
 	{
 		$aItems = array();
 		$db = $GLOBALS["TYPO3_DB"];
@@ -428,7 +437,8 @@
 		return $oForm->_oParent->flexConf["plugin_userpid"];
 	}
 	
-	function _populateDefaultGroupId($aData, $aParams, $oForm)
+//	function _populateDefaultGroupId($aData, $aParams, $oForm)
+	function _populateDefaultGroupId($aParams, $oForm)
 	{
 		$aGroups = $this->_populateGroups(array(), array(), $oForm);
 		
@@ -463,6 +473,15 @@
 	function _getTemplatePath()
 	{
 		$lang = $GLOBALS["TSFE"]->lang;
+		if (array_key_exists("plugin_templatepath", $this->flexConf) and !empty($this->flexConf["plugin_templatepath"])) {
+			$tempUrl = t3lib_div::getFileAbsFileName( $this->flexConf["plugin_templatepath"] . $lang . "/template.html");
+			if(file_exists($tempUrl) && is_readable($tempUrl))
+				return $tempUrl;
+			$tempUrl = t3lib_div::getFileAbsFileName( $this->flexConf["plugin_templatepath"] . "default/template.html");
+			if(file_exists($tempUrl) && is_readable($tempUrl))
+				return $tempUrl;
+		}
+
 		$tempUrl = t3lib_div::getFileAbsFileName("EXT:" . $this->extKey . "/" . dirname($this->scriptRelPath) . "/templates/" . $lang . "/template.html");
 
 		if(!file_exists($tempUrl) || !is_readable($tempUrl))