Fixed staff/new staff role assign logic