diff --git a/calendar/templates/default/header.inc.php b/calendar/templates/default/header.inc.php
index 73bc0a6dfe..5aa1ae9d39 100755
--- a/calendar/templates/default/header.inc.php
+++ b/calendar/templates/default/header.inc.php
@@ -122,9 +122,18 @@
 		reset($this->bo->grants);
 		while(list($grantor,$temp_rights) = each($this->bo->grants))
 		{
-			$form_options .= '    <option value="'.$grantor.'"'.($grantor==$this->bo->owner?' selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($grantor).'</option>'."\n";
-      }
-		reset($this->bo->grants);
+			$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
+			$drop_down[$lname.' '.$fname] = Array(
+				'grantor'	=> $grantor,
+				'name'		=> $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+			);
+		}
+		@reset($drop_down);
+		@ksort($drop_down);
+		while(list($key,$grant) = each($drop_down))
+		{
+			$form_options .= '    <option value="'.$grant['grantor'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
+      }		reset($this->bo->grants);
 		
 		$var = Array(
 			'form_width' => $remainder,
diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php
index 73bc0a6dfe..6c673445b2 100755
--- a/calendar/templates/idsociety/header.inc.php
+++ b/calendar/templates/idsociety/header.inc.php
@@ -122,7 +122,17 @@
 		reset($this->bo->grants);
 		while(list($grantor,$temp_rights) = each($this->bo->grants))
 		{
-			$form_options .= '    <option value="'.$grantor.'"'.($grantor==$this->bo->owner?' selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($grantor).'</option>'."\n";
+			$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
+			$drop_down[$lname.' '.$fname] = Array(
+				'grantor'	=> $grantor,
+				'name'		=> $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+			);
+		}
+		@reset($drop_down);
+		@ksort($drop_down);
+		while(list($key,$grant) = each($drop_down))
+		{
+			$form_options .= '    <option value="'.$grant['grantor'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
       }
 		reset($this->bo->grants);
 		
diff --git a/calendar/templates/justweb/header.inc.php b/calendar/templates/justweb/header.inc.php
index 73bc0a6dfe..d74fe6c426 100755
--- a/calendar/templates/justweb/header.inc.php
+++ b/calendar/templates/justweb/header.inc.php
@@ -122,9 +122,19 @@
 		reset($this->bo->grants);
 		while(list($grantor,$temp_rights) = each($this->bo->grants))
 		{
-			$form_options .= '    <option value="'.$grantor.'"'.($grantor==$this->bo->owner?' selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($grantor).'</option>'."\n";
+			$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
+			$drop_down[$lname.' '.$fname] = Array(
+				'grantor'	=> $grantor,
+				'name'		=> $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+			);
+		}
+		@reset($drop_down);
+		@ksort($drop_down);
+		while(list($key,$grant) = each($drop_down))
+		{
+			$form_options .= '    <option value="'.$grant['grantor'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
       }
-		reset($this->bo->grants);
+      reset($this->bo->grants);
 		
 		$var = Array(
 			'form_width' => $remainder,
diff --git a/calendar/templates/verdilak/header.inc.php b/calendar/templates/verdilak/header.inc.php
index 73bc0a6dfe..d74fe6c426 100755
--- a/calendar/templates/verdilak/header.inc.php
+++ b/calendar/templates/verdilak/header.inc.php
@@ -122,9 +122,19 @@
 		reset($this->bo->grants);
 		while(list($grantor,$temp_rights) = each($this->bo->grants))
 		{
-			$form_options .= '    <option value="'.$grantor.'"'.($grantor==$this->bo->owner?' selected':'').'>'.$GLOBALS['phpgw']->common->grab_owner_name($grantor).'</option>'."\n";
+			$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
+			$drop_down[$lname.' '.$fname] = Array(
+				'grantor'	=> $grantor,
+				'name'		=> $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+			);
+		}
+		@reset($drop_down);
+		@ksort($drop_down);
+		while(list($key,$grant) = each($drop_down))
+		{
+			$form_options .= '    <option value="'.$grant['grantor'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
       }
-		reset($this->bo->grants);
+      reset($this->bo->grants);
 		
 		$var = Array(
 			'form_width' => $remainder,