diff --git a/www-ssl/inc/funktion_schichtplan.php b/www-ssl/inc/funktion_schichtplan.php
index 3d2070b9..e2ea7168 100755
--- a/www-ssl/inc/funktion_schichtplan.php
+++ b/www-ssl/inc/funktion_schichtplan.php
@@ -102,9 +102,26 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
 				$Spalten.= Get_Text("inc_schicht_sind"). ":<br>\n\t\t";
 			
 			foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-      				$Spalten.= "&nbsp;&nbsp;". UID2Nick( $TempEngelID ).
-      					   DisplayAvatar( $TempEngelID ).
-					   "<br>\n\t\t";
+			{
+
+				if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" )
+				{
+					if( UIDgekommen( $TempEngelID ) == "1")
+	      					$Spalten.= "&nbsp;&nbsp;<span style=\"color: blue;\">". 
+							   UID2Nick( $TempEngelID ).
+      							   DisplayAvatar( $TempEngelID ).
+							   "</span><br>\n\t\t";
+					else
+      						$Spalten.= "&nbsp;&nbsp;<span style=\"color: red;\">". 
+							   UID2Nick( $TempEngelID ).
+      							   DisplayAvatar( $TempEngelID ).
+							   "</span><br>\n\t\t";
+				}
+				else
+      					$Spalten.= "&nbsp;&nbsp;". UID2Nick( $TempEngelID ).
+      						   DisplayAvatar( $TempEngelID ).
+						   "<br>\n\t\t";
+			}
 			$Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
 		  }
 		
diff --git a/www-ssl/inc/funktion_user.php b/www-ssl/inc/funktion_user.php
index 660e55a1..f679245d 100755
--- a/www-ssl/inc/funktion_user.php
+++ b/www-ssl/inc/funktion_user.php
@@ -56,15 +56,13 @@ function ReplaceSmilies($eckig) {
 }
 
 function displayavatar($dumdidum) {
-include ("./inc/db.php");
+	include ("./inc/db.php");
+	global $displayavatar;
         
        $asql = "select * from User where UID = $dumdidum";
        $aerg = mysql_query ($asql, $con);
-       $displayavatar= mysql_result($aerg, 0, "Avatar");
-       if ($displayavatar<>0){
-            return ("&nbsp;<img src=\"./inc/avatar/avatar$displayavatar.gif\">");
-       }
-
+       if (($displayavatar<>0) && (mysql_num_rows($Erg)) )
+            return ("&nbsp;<img src=\"./inc/avatar/avatar". mysql_result($aerg, 0, "Avatar"). ".gif\">");
 }
 
 function Ausgabe_Feld($RID) {
@@ -81,5 +79,19 @@ function Ausgabe_Feld($RID) {
 	return mysql_query($SQL2, $con);
 }
 
+function UIDgekommen($UID) {
+  include ("./inc/db.php");
+  
+  $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
+  $Erg = mysql_query($SQL, $con);
+
+  //echo $UID."#";
+  if( mysql_num_rows($Erg))
+	return mysql_result($Erg, 0);
+  else
+  	return "0";
+}
+
+
 
 ?>