Feature/login fixes