Resolved several errors during authentication