Further Account Store Mapping fixes