Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2050)
+++ branches/2.8.x/CHANGELOG	(revision 2051)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+29 Dec-2013 Build 2051 Manuela v.d.Decken(DarkViper)
+# account/preferences_form : language selection fixed
+# account/forgot_form : password generation fixed
 22 Dec-2013 Build 2050 Manuela v.d.Decken(DarkViper)
 # little Typofixes in admin/groups/languages/IT.php
 20 Dec-2013 Build 2049 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2050)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2051)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.4');
-if(!defined('REVISION')) define('REVISION', '2050');
+if(!defined('REVISION')) define('REVISION', '2051');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/account/forgot_form.php
===================================================================
--- branches/2.8.x/wb/account/forgot_form.php	(revision 2050)
+++ branches/2.8.x/wb/account/forgot_form.php	(revision 2051)
@@ -55,13 +55,12 @@
         			// Tell the user that their password cannot be reset more than once per hour
         				$errMsg = $MESSAGE['FORGOT_PASS_ALREADY_RESET'];
         			} else {
-        				require_once(WB_PATH.'/framework/PasswordHash.php');
-        				$pwh = new PasswordHash(0, true);
+        				$pwh = Password::getInstance();
         				$old_pass = $results_array['password'];
         			// Generate a random password then update the database with it
-        				$new_pass = $pwh->NewPassword();
+        				$new_pass = $pwh->createNew();
         				$sql = 'UPDATE `'.TABLE_PREFIX.'users` '.
-        				       'SET `password`=\''.$pwh->HashPassword($new_pass, true).'\', '.
+        				       'SET `password`=\''.md5($new_pass);
         				           '`last_reset`='.time().' '.
         				       'WHERE `user_id`='.(int)$results_array['user_id'];
         				unset($pwh); // destroy $pwh-Object
Index: branches/2.8.x/wb/account/preferences_form.php
===================================================================
--- branches/2.8.x/wb/account/preferences_form.php	(revision 2050)
+++ branches/2.8.x/wb/account/preferences_form.php	(revision 2051)
@@ -40,7 +40,7 @@
 	$sql  = 'SELECT `language` ';
 	$sql .= 'FROM `'.TABLE_PREFIX.'users` ';
 	$sql .= 'WHERE `user_id` = '.$wb->get_user_id();
-    if ($sUserLanguage = $database->get_one($sql)) {
+    if (($sUserLanguage = $database->get_one($sql))) {
 		$_SESSION['LANGUAGE'] = $sUserLanguage;
     }
 
@@ -49,10 +49,10 @@
 $sLanguage = LANGUAGE.'.php';
 
 $LanguageDir = WB_PATH .'/account/languages/';
-$sLanguageFile = ( file_exists($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
+$sLanguageFile = ( is_readable($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
 $sLanguageFile = ( is_readable($sLanguageFile) ?  $sLanguageFile :  $LanguageDir.$sDefaultLanguage.'.php'   );
 // load module default language file (EN)
-require($sLanguageFile);
+if (is_readable($sLanguageFile)) { require_once($sLanguageFile); }
 
 if(!function_exists('utf8_check')) { require(WB_PATH.'/framework/functions-utf8.php'); }