Change remote employee hint under certain conditions

fixes #7690