Fix double wallet store on open/create/join
Merge pull request #832 from yemel/fix/double-store

Fix double wallet store on open/create/join