diff --git a/cis/public/coodle.php b/cis/public/coodle.php
index 7447ac5c2..721f2d3c0 100644
--- a/cis/public/coodle.php
+++ b/cis/public/coodle.php
@@ -866,12 +866,12 @@ if (isset($_GET['resend']))
 			echo '<br><br><div class="alert alert-info" style="width: 800px">
 			<span class="glyphicon glyphicon-info-sign"></span>
 			Sie können ihre vorläufigen Terminzusagen in ihr Kalendersystem einbinden.<br>
-			Importieren Sie dazu die .ics-Datei aus folgendem Link in ihren Kalender:<br>
-			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/'.$uid.'" target="_blank">
-			'.APP_ROOT.'cis/public/ical_coodle.php/'.$uid.'
+			Importieren Sie dazu die .ics-Datei des folgenden Links in ihren Kalender:<br>
+			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'" target="_blank">
+			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'
 			</a>
 			<br><br>
-			Die Datei enthält ihre Terminzusagen aus <u>allen laufenden Umfragen</u> in anonymisierter Form.
+			Die Datei enthält ihre Terminzusagen aus <b>allen laufenden Umfragen</b>    .
 			</div>';
 		}
 
diff --git a/cis/public/ical_coodle.php b/cis/public/ical_coodle.php
index fd9d408b5..38512c95a 100644
--- a/cis/public/ical_coodle.php
+++ b/cis/public/ical_coodle.php
@@ -28,13 +28,27 @@ require_once('../../include/functions.inc.php');
 require_once('../../include/coodle.class.php');
 require_once('../../include/ical.class.php');
 
-$uid = mb_substr($_SERVER['PATH_INFO'],1);
+
+$params = mb_substr($_SERVER['PATH_INFO'],1);
+$paramsArray = explode('/',$params);
+$private = false;
+
+if ($paramsArray[0] == 'cipher_encryption')
+{
+	$uid = decryptData($paramsArray[1],LVPLAN_CYPHER_KEY);
+	$private = true;
+}
+else
+{
+	$uid = $paramsArray[0];
+}
 
 $bn = new benutzer();
 if(!$bn->load($uid))
 	die('User invalid');
 	
 header("Content-Type: text/calendar; charset=UTF-8");
+header("Content-disposition: filename=Coodle Terminzusagen.ics");
 
 echo "BEGIN:VCALENDAR\n";
 echo "VERSION:2.0\n";
@@ -80,7 +94,7 @@ foreach($umfragen->result as $umfrage)
 		if($ressource_id = $ressource->RessourceExists($umfrage->coodle_id, $uid))
 		{	
 			// Terminvorschlaege laden die angekreuzt wurden
-			$termine = new coodle();
+			$termine = new coodle($umfrage->coodle_id);
 			$termine->getRessourceTermin($umfrage->coodle_id, $ressource_id);
 			foreach($termine->result as $termin)
 			{
@@ -91,10 +105,22 @@ foreach($umfragen->result as $umfrage)
 				$date->add($interval);
 				$uhrzeit_ende = $date->format('H:i:s');
 				$dtende = $date->format('Ymd\THis');
+				$ersteller = new benutzer($termine->ersteller_uid);
+				if ($private == true)
+				{
+					$summary = 'Coodle Terminoption '.strip_tags($termine->titel);
+					$description = 'Erstellt von '.$ersteller->vorname.' '.$ersteller->nachname;
+				}
+				else
+				{
+					$summary = 'Coodle Terminoption';
+					$description = '';
+				}
 
 				echo "\nBEGIN:VEVENT";
-				echo "\nUID:Coodle_Terminoption".$dtstart."_".$dtende."";
-				echo "\nSUMMARY:Coodle Terminoption";
+				echo "\nUID:Coodle_Terminoption".$dtstart."_".$dtende;
+				echo "\nSUMMARY:".$summary;
+				echo "\nDESCRIPTION:".$description;
 				echo "\nDTSTART;TZID=Europe/Vienna:$dtstart";
 				echo "\nDTEND;TZID=Europe/Vienna:$dtende";
 				echo "\nTRANSP:OPAQUE";