Merge "Don't always change username when adding account" into sc-dev