FREEPBX-7117 - fixing implementation per discussion with the rest of the dev team