This is about to be solved with our new self-sovereign wallet. We are slowly rolling this out.