config defaults and account decorators fix