Working on edit users and last step