[Passport Wallet] #8 Finishing