amendments for remote id - server side