Fixing Store Account editing