Fix 2505 - Part 2/2

Move storeconfig options here and simplify slightly.