Address QA concerns for review FREEPBX-21