Some login cleanup