Changes to Account setup

Same functionality different code, different view as well