JARVIS-483 Anonymous authentication fix
Finish JARVIS-483