[FIX] Account Recovery flow updates