diff --git a/cis/public/freebusy.php b/cis/public/freebusy.php
index f9d89c616..ab3f31bd2 100755
--- a/cis/public/freebusy.php
+++ b/cis/public/freebusy.php
@@ -29,11 +29,23 @@ require_once('../../include/freebusy.class.php');
 require_once('../../include/benutzer.class.php');
 require_once('../../include/ical.class.php');
 
+if(!isset($_SERVER['PATH_INFO']))
+	die('Username fehlt. Aufruf ueber '.APP_ROOT.'cis/public/freebusy.php/username/');
+	
 $uid = mb_substr($_SERVER['PATH_INFO'],1);
 
 $bn = new benutzer();
 if(!$bn->load($uid))
-	die('User invalid');
+{
+	// Optional kann auch der Alias als Parameter uebergeben werden
+	// Dies ist fuer die verwendung von Outlook nuetzlich
+	if($bn->loadAlias($uid))
+	{
+		$uid = $bn->uid;
+	}
+	else
+		die('User invalid');
+}
 	
 $freebusy = new freebusy();
 $freebusy->getFreeBusy($uid);
@@ -41,7 +53,7 @@ header("Content-Type: text/calendar; charset=UTF-8");
 
 echo "BEGIN:VCALENDAR\n";
 echo "VERSION:2.0\n";
-echo "PRODID:-//FH TECHNIKUM WIEN//EN\n";
+echo "PRODID:-//FHCOMPLETE//EN\n";
 echo "METHOD:PUBLISH\n";
 echo 'ORGANIZER;CN=',$bn->vorname,' ',$bn->nachname,':mailto:',$uid,'@',DOMAIN,"\n";
 echo 'DTSTAMP;TZID=Europe/Vienna:',date('Ymd', mktime(date('H'),date('i'),date('s'),date('m'),date('d')-5,date('Y'))),'T',date('Hms'),"\n";
@@ -95,4 +107,4 @@ else
 }
 echo $ical->getFreeBusy();
 echo "\nEND:VCALENDAR";
-?>
\ No newline at end of file
+?>
diff --git a/cis/public/freebusy_lvplan.php b/cis/public/freebusy_lvplan.php
index 2a461de13..e9773ccde 100755
--- a/cis/public/freebusy_lvplan.php
+++ b/cis/public/freebusy_lvplan.php
@@ -45,7 +45,7 @@ header("Content-Type: text/calendar; charset=UTF-8");
 
 echo "BEGIN:VCALENDAR\n";
 echo "VERSION:2.0\n";
-echo "PRODID:-//FH TECHNIKUM WIEN//EN\n";
+echo "PRODID:-//FHCOMPLETE//EN\n";
 echo "METHOD:PUBLISH\n";
 echo 'ORGANIZER;CN=',$bn->vorname,' ',$bn->nachname,':mailto:',$uid,'@',DOMAIN,"\n";
 echo 'DTSTAMP;TZID=Europe/Vienna:',date('Ymd', mktime(date('H'),date('i'),date('s'),date('m'),date('d')-5,date('Y'))),'T',date('Hms'),"\n";