Employee to User migration fixes