Discussed with @alext in meatspace and we've agreed to add a story to deal with this as part of our next sprint and will merge this in the short term to fix a known user bug.