fixed problems with auth and user key

going ahead and sending the first part of this branches updates: the fixing
expect another one / more on this one with some redesign/refactor of auth flow because I now realize it's not very good