Did the first, haven't done the second... not sure if we should do so automatically if they've deliberately set it to a different value...