Fix auth-bug
Merge branch 'auth-bug' into signup-tweaks