fixed auth-services logic