Fix Bug issues in Auth Service