Some login fixes...