HomeOfficeUser final changes

This is in production