S70 Watch Face changes on recharging

Since a firmware update, a few updates ago, my chosen watch face changes to a default crappy one every time I charge up the watch.

To get it back I need to go to Connect IQ and find my watch face, pretend to change the setting and save so I can then find it on the watch.

It was working perfectly for over a year but now it is a pain. My chosen watch face is the one with the red arrow pointing to it.

Has anyone else experience this.