Added new flag to manually control the reset of user defaults