Melissa/login hotfix