Added check to grab account wide settings