properly setting staff_change flag
Merge branch 'master' into pinauthintegration