User Email preferences being overriden

Please start by updating to latest beta and see if it still happens, so we can rule out any bugs that have been fixed in the meanwhile.