Merge "Prevent "Log in" being used in two different contexts"