Verification, reset-password improvements