better error handling on organization logins