[IMP] account: revert wrong commit 9590 and set default value with customer refrence
[IMP] account: cleanup