diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index f1216b86d..09fcf4bf8 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -65,7 +65,9 @@ $cn = new Database($gDossier);
 $g_user = new User($cn);
 $g_user->check(true);
 $g_user->check_dossier($gDossier, true);
-$g_parameter=new Own($cn);
+if ($gDossier<>0) {
+    $g_parameter=new Own($cn);
+}
 $html = var_export($_REQUEST, true);
 
 switch ($op)
diff --git a/html/js/scripts.js b/html/js/scripts.js
index b094f7d5a..5e65d6e7e 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1847,7 +1847,7 @@ function set_preference(p_dossier) {
 				      onFailure:ajax_misc_failure,
 				      onSuccess:function(req){
 						remove_waiting_box();
-                                                add_div({id:'preference_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box'});
+                                                add_div({id:'preference_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
 						$('preference_div').innerHTML=req.responseText;
                                                 try
                                                 {
diff --git a/html/user_login.php b/html/user_login.php
index 37ee9bbdf..e9b8780d4 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -96,6 +96,20 @@ if ( $User->Admin()  == 1)
 include_once("user_menu.php");
 $priv=($User->admin==1)?"Administrateur":"Utilisateur";
 load_all_script();
+if ( isset ($_POST['set_preference'])) {
+    //// Save value
+    extract($_POST);
+
+    if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0)
+    {
+	$User->save_password($pass_1,$pass_2);
+        
+    }
+    $User->save_global_preference('THEME', $style_user);
+    $User->save_global_preference('LANG', $lang);
+    $_SESSION['g_theme']=$style_user;
+    $_SESSION['g_lang']=$lang;
+}
 echo '<div class="welcome"> ';
 /**
  *
@@ -132,7 +146,9 @@ if ( $User->Admin()  == 1 )
 {
     $result.="<TD  class=\"tool\" ><A class=\"cell\" HREF=\"admin_repo.php\"> Administration  </A></TD>";
 }
-$result.='<TD class="tool"><A class="cell" HREF="user_pref.php">'._('Préférence').'</a></TD>';
+$result.='<TD class="tool">';
+$result.='<a onclick="set_preference(0)" title="Préférence" href="javascript:void(0)" class="mtitle">Préférence</a>';
+$result.= '</TD>';
 $result.='<TD  class="tool" ><A class="cell" HREF="logout.php" >'._('Deconnexion').'</a></TD>';
 $result.="</TR>";
 $result.="</table>";
diff --git a/include/ajax_preference.php b/include/ajax_preference.php
index af18fbf03..51f05e8c3 100644
--- a/include/ajax_preference.php
+++ b/include/ajax_preference.php
@@ -31,6 +31,7 @@ require_once('class_acc_report.php');
 require_once('class_periode.php');
 echo HtmlInput::title_box(_('Préférence'), 'preference_div');
 echo '<DIV class="content">';
+echo '<p class="notice"> Si vous validez la page sera rechargée</p>';
 //----------------------------------------------------------------------
 //
 global $g_user;
@@ -38,7 +39,7 @@ global $g_user;
 $g_user=new User($cn);
 $inside_dossier = false;
 
-if (isset($_REQUEST['gDossier']))
+if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0)
 {
     $g_user->load_global_pref();
     $msg = "";
@@ -60,7 +61,6 @@ if (isset($_REQUEST['gDossier']))
 	from theme
 	order by the_name");
     $style->selected =$_SESSION['g_theme'];
-    echo '<h2 class="info2">' . _('Changez vos préférences') . '</h2>';
 ?>
 
 <div class="content" >
diff --git a/include/class_user.php b/include/class_user.php
index 62eb6ccba..fa91288d4 100644
--- a/include/class_user.php
+++ b/include/class_user.php
@@ -1138,7 +1138,6 @@ class User
             $l_pass = md5($_POST['pass_1']);
             $repo->exec_sql("update ac_users set use_pass=$1 where use_login=$2", array($l_pass, $_SESSION['g_user']));
             $_SESSION['g_pass'] = $_POST['pass_1'];
-            echo "<i>" . _('Mot de passe est modifiée') . "</i>";
         } else {
             alert(_("Les mots de passe ne correspondent pas. Mot de passe inchangé"));
         }