Hotfix to cs_office and the autofirstwae