Cherry pick account changes

And ready to be released - this will give accounts to 10% of all users.