Melissa/login fixes