Merge "Fix bug with starting users in background."