Further refinements for account recovery