[Kaavya] Fixing guest user scenario