Fixing Sign in to be less dependent on certain things