Simplify user account creation/email addition, only generate the keys whenever the assertion is asked for.