Fixes for guest accounts