diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 20873816c0..7118f32a61 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -344,7 +344,18 @@
 				$a[] = $firstname;
 			}
 
-			return '<' . $lid . '> ' . implode(', ',$a);
+			switch(count($a))
+			{
+				case 0:
+					return $lid;
+					break;
+				case 1:
+					return '<' . $lid . '> ' . $a[0];
+					break;
+				case 2:
+					return '<' . $lid . '> ' . implode(', ',$a);
+					break;
+			}
 		}
 
 		/*!