diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 52ca3932fdb..095a14ab439 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -223,10 +223,6 @@ if ($action == 'add' && $canadduser)
         		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
         	}
         }
-        else if (! empty($_POST["admin"]))
-        {
-        	$object->entity=0;
-        }
         else
         {
         	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
@@ -372,10 +368,6 @@ if ($action == 'update' && ! $_POST["cancel"])
             		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
             	}
             }
-            else if(! empty($_POST["admin"]))
-            {
-            	$object->entity=0;
-            }
             else
             {
             	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
@@ -1582,7 +1574,7 @@ else
             print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+            print '<input type="hidden" name="entity" value="'.$fuser->entity.'">';
             print '<table width="100%" class="border">';
 
             $rowspan=13;