Fix/join completed wallet

fixes #348