Fix issue #2111
Issue #2111 - change account settings configuration