Fixing users
Finish fixing user signup