Finished fixing user creation