Made changes to include if a unque user needs to be created