diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index f92b9e6b1b2..e1391504d10 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -903,8 +903,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     if (empty($conf->global->USER_DISABLE_STATE))
     {
         print '<tr><td>'.fieldLabel('State','state_id').'</td><td class="maxwidthonsmartphone">';
-        if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
-        else print $countrynotdefined;
+        print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
         print '</td></tr>';
     }
 		
@@ -1987,8 +1986,8 @@ else
             // State
             if (empty($conf->global->USER_DISABLE_STATE))
             {
-                print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">';
-                print $formcompany->select_state($object->state_id,$object->country_code);
+                print '<tr><td>'.fieldLabel('State','state_id').'</td><td>';
+                print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
                 print '</td></tr>';
             }
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 2d52d11a588..06e8250a870 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -169,7 +169,7 @@ class User extends CommonObject
 
 		// Get user
 		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.email, u.job, u.skype, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
-		$sql.= " u.address, u.zip, u.town, u.fk_state, u.fk_country as country_id,";
+		$sql.= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
 		$sql.= " u.admin, u.login, u.note,";
 		$sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
 		$sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,";
@@ -258,7 +258,7 @@ class User extends CommonObject
                 $this->country_code = $obj->country_id?$obj->country_code:'';
                 $this->country 		= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
 
-                $this->state_id     = $obj->fk_departement;
+                $this->state_id     = $obj->state_id;
                 $this->state_code   = $obj->state_code;
                 $this->state        = ($obj->state!='-'?$obj->state:'');