Added setting check to allow for non-registration