better errors for user sign in
merge