Replace deprecated User::editToken calls

Change-Id: I90202feaea6836ed5eba27a12216093d958ea1c2