Some updates to remote user stuff