use account app settings to address #881
Merge branch 'master' into integration