Commit fix with Validators and Login Service