Added support for guest users with locale