Fix user edit issue