Fix user edit v2