cal/login fixes