New changes for new login auth services to fix errors