Finish user, edit, update
Fix update