Adds invalid email/password error if server 401's
Fixes merge conflict and removes debuggs