We are also going to need a configuration setting so that the admin can decide whether or not to enable this feature.