I'd say give SafeXP the boot. Reformat and start over. BUt really this issue isn't high on the reasons to reformat list. BUt if you need to change it, that may be the fastest way.