diff --git a/preferences/inc/hook_settings.inc.php b/preferences/inc/hook_settings.inc.php
index e2a7808ad1..55e4813144 100755
--- a/preferences/inc/hook_settings.inc.php
+++ b/preferences/inc/hook_settings.inc.php
@@ -57,8 +57,8 @@
 	create_select_box('Date format','dateformat',$date_formats);
 
 	$time_formats = array(
-		'12' => '12 hour',
-		'24' => '24 hour'
+		'12' => lang('12 hour'),
+		'24' => lang('24 hour')
 	);
 	create_select_box('Time format','timeformat',$time_formats);
 
@@ -89,18 +89,18 @@
 	{
 		// The 'True' is *NOT* being used as a constant, don't change it
 		$yes_and_no = array(
-			'True' => 'Yes',
-			''     => 'No'
+			'True' => lang('Yes'),
+			''     => lang('No')
 		);
 		create_select_box('Show current users on navigation bar','show_currentusers',$yes_and_no);
 	}
 
 	reset($GLOBALS['phpgw_info']['user']['apps']);
-	while (list($permission) = each($GLOBALS['phpgw_info']['user']['apps']))
+	while (list($app) = each($GLOBALS['phpgw_info']['user']['apps']))
 	{
-		if ($GLOBALS['phpgw_info']['apps'][$permission]['status'] != 2)
+		if ($GLOBALS['phpgw_info']['apps'][$app]['status'] != 2 && $app)
 		{
-			$user_apps[$permission] = $permission;
+			$user_apps[$app] = $GLOBALS['phpgw_info']['apps'][$app]['title'] ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app);
 		}
 	}
 	create_select_box('Default application','default_app',$user_apps);
diff --git a/preferences/setup/phpgw_de.lang b/preferences/setup/phpgw_de.lang
index 1efbe9482d..259c691444 100644
--- a/preferences/setup/phpgw_de.lang
+++ b/preferences/setup/phpgw_de.lang
@@ -1,3 +1,5 @@
+12 hour	preferences	de	12 Stunden
+24 hour	preferences	de	24 Stunden
 acl grants have been updated	preferences	de	ACL (Zugangskontrollliste) wurde upgedatet
 change your password	preferences	de	Passwort ändern
 change your profile	preferences	de	Profil ändern
diff --git a/preferences/setup/phpgw_en.lang b/preferences/setup/phpgw_en.lang
index d0af581ea3..d2b0a8889a 100644
--- a/preferences/setup/phpgw_en.lang
+++ b/preferences/setup/phpgw_en.lang
@@ -1,3 +1,5 @@
+12 hour	preferences	en	12 hour
+24 hour	preferences	en	24 hour
 %1 - Preferences	preferences	en	%1 - Preferences
 acl grants have been updated	preferences	en	ACL grants have been updated
 change your password	preferences	en	Change your Password