Fix for guest users