WIP. Fixing user auth