fix up: sync remote_user

Change-Id: Idc248a7490108778f7769e96815357810d58db40