Bugs v13 account setup

primarily related to issue with setting up existing accounts