Get the same account if reinstalled package
Avoid collision between dev and production users
Merge branch 'master' into connect-provider