Update default user references

Change-Id: I416e39d7073c9d0ed1eb9986e2e5fc58ec29c37a