Improve the UX around opting in to store in keyring