diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang
index 897f6ba427..ef6a8460ed 100644
--- a/admin/setup/phpgw_en.lang
+++ b/admin/setup/phpgw_en.lang
@@ -65,7 +65,6 @@ enter your default FTP server	admin	en	Enter your default FTP server
 enter your HTTP proxy server	admin	en	Enter your HTTP proxy server
 enter your HTTP proxy server port	admin	en	Enter your HTTP proxy server port
 find and register all application hooks	admin	en	Find and Register all Application Hooks
-force selectbox	admin	en	Force SelectBox
 global categories	admin	en	Global Categories
 group ?	admin	en	group ?
 group has been added	common	en	Group has been added
@@ -173,7 +172,6 @@ use pure html compliant code (not fully working yet)	admin	en	Use pure HTML comp
 user accounts	admin	en	User accounts
 userdata	admin	en	userdata
 user groups	admin	en	User groups
-users choice	admin	en	Users Choice
 use theme	admin	en	Use theme
 view access log	admin	en	View access log
 view error log	admin	en	View error log
diff --git a/phpgwapi/setup/phpgw_en.lang b/phpgwapi/setup/phpgw_en.lang
index d40672252c..7285299e07 100644
--- a/phpgwapi/setup/phpgw_en.lang
+++ b/phpgwapi/setup/phpgw_en.lang
@@ -138,6 +138,7 @@ filter	common	en	Filter
 finland	common	en	FINLAND
 first name	common	en	First name
 firstname	common	en	Firstname
+force selectbox	common	en	Force SelectBox
 france	common	en	FRANCE
 french guiana	common	en	FRENCH GUIANA
 french polynesia	common	en	FRENCH POLYNESIA
@@ -397,6 +398,7 @@ uruguay	common	en	URUGUAY
 user	common	en	User
 username	common	en	Username
 users	common	en	users
+users choice	common	en	Users Choice
 uzbekistan	common	en	UZBEKISTAN
 vanuatu	common	en	VANUATU
 venezuela	common	en	VENEZUELA
diff --git a/preferences/index.php b/preferences/index.php
index da2b201224..4522e056f9 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -12,14 +12,15 @@
 
 	/* $Id$ */
 
-	$phpgw_info['flags']['currentapp'] = 'preferences';
+	$phpgw_info = array();
+	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'preferences';
 	include('../header.inc.php');
 
 	$pref_tpl = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
 	$templates = Array(
 		'pref' => 'index.tpl'
 	);
-	
+
 	$pref_tpl->set_file($templates);
 
 	$pref_tpl->set_block('pref','list');
@@ -30,15 +31,13 @@
 
 	if ($GLOBALS['phpgw']->acl->check('run',1,'admin'))
 	{
-		// This is where we will keep track of our postion.
+		// This is where we will keep track of our position.
 		// Developers won't have to pass around a variable then
 		$session_data = $GLOBALS['phpgw']->session->appsession('session_data','preferences');
 
 		if (! is_array($session_data))
 		{
-			$session_data = array(
-				'type' => 'user'
-			);
+			$session_data = array('type' => 'user');
 			$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
 		}
 
@@ -49,30 +48,28 @@
 		else
 		{
 			$type = $GLOBALS['HTTP_GET_VARS']['type'];
-			$session_data = array(
-				'type' => $type
-			);
+			$session_data = array('type' => $type);
 			$GLOBALS['phpgw']->session->appsession('session_data','preferences',$session_data);
 		}
 
 		$tabs[] = array(
-			'label' => 'Your preferences',
+			'label' => lang('Your preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=user')
 		);
 		$tabs[] = array(
-			'label' => 'Default preferences',
+			'label' => lang('Default preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=default')
 		);
 		$tabs[] = array(
-			'label' => 'Forced preferences',
+			'label' => lang('Forced preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/index.php','type=forced')
 		);
 
 		switch($type)
 		{
-			case 'user':		$selected = 0; break;
-			case 'default':	$selected = 1; break;
-			case 'forced':		$selected = 2; break;
+			case 'user':    $selected = 0; break;
+			case 'default': $selected = 1; break;
+			case 'forced':  $selected = 2; break;
 		}
 		$pref_tpl->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
 	}
@@ -80,10 +77,10 @@
 	// This func called by the includes to dump a row header
 	function section_start($name='',$icon='',$appname='')
 	{
-		global $phpgw_info, $pref_tpl;
+		global $pref_tpl;
 
-		$pref_tpl->set_var('icon_backcolor',$phpgw_info['theme']['row_off']);
-//		$pref_tpl->set_var('link_backcolor',$phpgw_info['theme']['row_off']);
+		$pref_tpl->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
+//		$pref_tpl->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']);
 		$pref_tpl->set_var('a_name',$appname);
 		$pref_tpl->set_var('app_name',lang($name));
 		$pref_tpl->set_var('app_icon',$icon);
@@ -133,7 +130,7 @@
 		section_end(); 
 	}
 
-	$phpgw->hooks->process('preferences',array('preferences'));
+	$GLOBALS['phpgw']->hooks->process('preferences',array('preferences'));
 	$pref_tpl->pfp('out','list');
-	$phpgw->common->phpgw_footer();
+	$GLOBALS['phpgw']->common->phpgw_footer();
 ?>
diff --git a/preferences/preferences.php b/preferences/preferences.php
index fef945b0c9..00ca80f107 100755
--- a/preferences/preferences.php
+++ b/preferences/preferences.php
@@ -62,7 +62,7 @@
 		}
 		else
 		{
-			return False;		
+			return False;
 		}
 	}
 
@@ -81,11 +81,14 @@
 
 		switch ($GLOBALS['type'])
 		{
-			case 'user':		$s = '<input name="user[' . $preference_name . ']" value="' . $GLOBALS['phpgw_info']['user']['preferences'][$_appname][$preference_name] . '">';
+			case 'user':
+				$s = '<input name="user[' . $preference_name . ']" value="' . $GLOBALS['phpgw_info']['user']['preferences'][$_appname][$preference_name] . '">';
 				break;
-			case 'default':	$s = '<input name="default[' . $preference_name . ']" value="' . $GLOBALS['dp']->data[$_appname][$preference_name] . '">';
+			case 'default':
+				$s = '<input name="default[' . $preference_name . ']" value="' . $GLOBALS['dp']->data[$_appname][$preference_name] . '">';
 				break;
-			case 'forced':		$s = '<input name="forced[' . $preference_name . ']" value="' . $GLOBALS['gp']->data[$_appname][$preference_name] . '">';
+			case 'forced':
+				$s = '<input name="forced[' . $preference_name . ']" value="' . $GLOBALS['gp']->data[$_appname][$preference_name] . '">';
 				break;
 		}
 		$t->set_var('row_value',$s);
@@ -218,23 +221,23 @@
 		}
 
 		$tabs[] = array(
-			'label' => 'Your preferences',
+			'label' => lang('Your preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $GLOBALS['HTTP_GET_VARS']['appname'] . '&type=user')
 		);
 		$tabs[] = array(
-			'label' => 'Default preferences',
+			'label' => lang('Default preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $GLOBALS['HTTP_GET_VARS']['appname'] . '&type=default')
 		);
 		$tabs[] = array(
-			'label' => 'Forced preferences',
+			'label' => lang('Forced preferences'),
 			'link'  => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $GLOBALS['HTTP_GET_VARS']['appname'] . '&type=forced')
 		);
 
 		switch($GLOBALS['type'])
 		{
-			case 'user':		$selected = 0; break;
-			case 'default':	$selected = 1; break;
-			case 'forced':		$selected = 2; break;
+			case 'user':    $selected = 0; break;
+			case 'default': $selected = 1; break;
+			case 'forced':  $selected = 2; break;
 		}
 		$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
 	}
@@ -260,7 +263,7 @@
 
 		if ($GLOBALS['type'] == 'default' && is_admin())
 		{
-			process_array($GLOBALS['dp'], $default);		
+			process_array($GLOBALS['dp'], $default);
 		}
 
 		if ($GLOBALS['type'] == 'forced' && is_admin())
@@ -302,7 +305,7 @@
 		if (! $GLOBALS['phpgw']->hooks->single('settings',$GLOBALS['HTTP_GET_VARS']['appname']))
 		{
 			$error = True;
-		}	
+		}
 	}
 
 	if ($error)
diff --git a/preferences/setup/phpgw_en.lang b/preferences/setup/phpgw_en.lang
index 8577fa442b..8ea1daafbc 100644
--- a/preferences/setup/phpgw_en.lang
+++ b/preferences/setup/phpgw_en.lang
@@ -22,4 +22,8 @@ theme (colors/fonts) selection	preferences	en	Theme (colors/fonts) Selection
 this server is located in the x timezone	preferences	en	 This server is located in the %1 timezone
 time format	preferences	en	Time format
 your current theme is: x	preferences	en	</b>
-you must enter a password	preferences	en	You must enter a password
\ No newline at end of file
+you must enter a password	preferences	en	You must enter a password
+your preferences	preferences	en	Your Preferences
+default preferences	preferences	en	Default Preferences
+forced preferences	preferences	en	Forced Preferences
+select one	preferences	en	Select one
diff --git a/preferences/setup/phpgw_ja.lang b/preferences/setup/phpgw_ja.lang
index ec4cc1befb..e03bb13966 100644
--- a/preferences/setup/phpgw_ja.lang
+++ b/preferences/setup/phpgw_ja.lang
@@ -25,7 +25,6 @@ text only	preferences	ja	
 theme (colors/fonts) selection	preferences	ja	テーマ（色・フォント）選択
 this server is located in the x timezone	preferences	ja	 タイムゾーン
 time format	preferences	ja	時間書式
-user choice	preferences	ja	選択して下さい
 use selectbox	preferences	ja	セレクトボックス
 use text entry	preferences	ja	テキスト入力
 your current theme is: x	preferences	ja	</b>