Some login fixes