diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 5c2ff63d73..126202219f 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -429,11 +429,14 @@
 			switch($display)
 			{
 				case 'all':
-					$name = "<$lid> ";
+					$name = '['.$lid.'] ';
 					// fall-through
 				case 'lastname':
 					$name .= implode(', ',$a);
 					break;
+				case 'firstall':
+					$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
+					break;
 				case 'firstname':
 				default:
 					$name = $firstname . ' ' . $lastname;
diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php
index 3956973e69..d3f1d9fc7b 100755
--- a/preferences/inc/hook_settings.inc.php
+++ b/preferences/inc/hook_settings.inc.php
@@ -128,7 +128,8 @@
 		'firstname' => lang('Firstname'). ' '.lang('Lastname'),
 		'lastname'  => lang('Lastname').', '.lang('Firstname'),
 		'username'  => lang('username'),
-		'all'       => '<'.lang('username').'> '.lang('Lastname').', '.lang('Firstname')
+		'firstall'  => lang('Firstname').' '.lang('Lastname').' ['.lang('username').']',
+		'all'       => '['.lang('username').'] '.lang('Lastname').', '.lang('Firstname')
 	);
 	create_select_box('How do you like to display accounts','account_display',$account_display,
 		'Set this to your convenience. For security reasons, you might not want to show your Loginname in public.');