diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index a29c55b4b1..f808b06013 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -381,10 +381,13 @@ class common
 			case 'lastall':
 				$name = $lastname . $delimiter . $firstname . ' ['.$lid.']';
 				break;
+			case 'allfirst':
+				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+				break;
 			case 'all':
 				/* fall through */
 			default:
-				$name = '['.$lid.'] ' . $firstname . ' ' . $lastname;
+				$name = '['.$lid.'] ' . $lastname . $delimiter . $firstname;
 		}
 		return $name;
 	}
diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php
index ee3a2b406d..946fd5084c 100755
--- a/preferences/inc/hook_settings.inc.php
+++ b/preferences/inc/hook_settings.inc.php
@@ -110,6 +110,7 @@
 		'username'  => lang('username'),
 		'firstall'  => lang('Firstname').' '.lang('Lastname').' ['.lang('username').']',
 		'lastall'   => lang('Lastname').', '.lang('Firstname').' ['.lang('username').']',
+		'allfirst'  => '['.lang('username').'] '.lang('Firstname'). ' '.lang('Lastname'),
 		'all'       => '['.lang('username').'] '.lang('Lastname').', '.lang('Firstname')
 	);