diff --git a/docs/flow/examples/enrollment-email-verification.json b/docs/flow/examples/enrollment-email-verification.json
index 284ffb52e..9c7092a32 100644
--- a/docs/flow/examples/enrollment-email-verification.json
+++ b/docs/flow/examples/enrollment-email-verification.json
@@ -84,6 +84,15 @@
             }
         },
         {
+            "identifiers": {
+                "pk": "9922212c-47a2-475a-9905-abeb5e621652"
+            },
+            "model": "passbook_policies_expression.expressionpolicy",
+            "attrs": {
+                "name": "policy-enrollment-password-equals",
+                "expression": "# Verifies that the passwords are equal\r\nreturn request.context['password'] == request.context['password_repeat']"
+            }
+        },{
             "identifiers": {
                 "pk": "096e6282-6b30-4695-bd03-3b143eab5580",
                 "name": "default-enrollment-email-verficiation"
@@ -126,6 +135,9 @@
                     "cb954fd4-65a5-4ad9-b1ee-180ee9559cf4",
                     "7db91ee8-4290-4e08-8d39-63f132402515",
                     "d30b5eb4-7787-4072-b1ba-65b46e928920"
+                ],
+                "validation_policies": [
+                    "9922212c-47a2-475a-9905-abeb5e621652"
                 ]
             }
         },
@@ -151,7 +163,7 @@
             "identifiers": {
                 "pk": "34e1e7d5-8eed-4549-bc7a-305069ff7df0",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
-                "stage": "7145399a-0015-4201-9560-2d5c6d27efeb",
+                "stage": "20375f30-7fa7-4562-8f6e-0f61889f2963",
                 "order": 0
             },
             "model": "passbook_flows.flowstagebinding",
@@ -163,7 +175,7 @@
             "identifiers": {
                 "pk": "e40467a6-3052-488c-a1b5-1ad7a80fe7b3",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
-                "stage": "130ab95a-5146-4ca9-a7b7-3518f629cc3e",
+                "stage": "6c342b94-790d-425a-ae31-6196b6570722",
                 "order": 1
             },
             "model": "passbook_flows.flowstagebinding",
@@ -206,29 +218,6 @@
             "attrs": {
                 "re_evaluate_policies": false
             }
-        },
-        {
-            "identifiers": {
-                "pk": "9922212c-47a2-475a-9905-abeb5e621652"
-            },
-            "model": "passbook_policies_expression.expressionpolicy",
-            "attrs": {
-                "name": "policy-enrollment-password-equals",
-                "expression": "# Verifies that the passwords are equal\r\nreturn request.context['password'] == request.context['password_repeat']"
-            }
-        },
-        {
-            "identifiers": {
-                "pk": "4f3b5a0a-8f91-438b-959c-c908415cacd9",
-                "policy": "9922212c-47a2-475a-9905-abeb5e621652",
-                "target": "20375f30-7fa7-4562-8f6e-0f61889f2963",
-                "order": 0
-            },
-            "model": "passbook_policies.policybinding",
-            "attrs": {
-                "enabled": true,
-                "timeout": 30
-            }
         }
     ]
 }
diff --git a/docs/flow/examples/login-conditional-captcha.json b/docs/flow/examples/login-conditional-captcha.json
index f2f0d4493..6134e53e2 100644
--- a/docs/flow/examples/login-conditional-captcha.json
+++ b/docs/flow/examples/login-conditional-captcha.json
@@ -126,7 +126,7 @@
             "identifiers": {
                 "pk": "02e4d220-3448-44db-822e-c5255cf7c250",
                 "policy": "688c9890-47ad-4327-a9e5-380e88d34be5",
-                "target": "998bdd3a-52b9-4298-8878-3c3fc993b68c",
+                "target": "3bcd6af0-48a6-4e18-87f3-d251a1a58226",
                 "order": 0
             },
             "model": "passbook_policies.policybinding",
diff --git a/docs/flow/examples/recovery-email-verification.json b/docs/flow/examples/recovery-email-verification.json
index cb8ac564a..c4bc4ed4b 100644
--- a/docs/flow/examples/recovery-email-verification.json
+++ b/docs/flow/examples/recovery-email-verification.json
@@ -57,14 +57,28 @@
         },
         {
             "identifiers": {
-                "pk": "d33ceb78-eb0d-44e7-828b-541414214eb3",
-                "name": "default-recovery-prompt-email"
+                "pk": "cd042fc6-cc92-4b98-b7e6-f4729df798d8"
             },
-            "model": "passbook_stages_prompt.promptstage",
+            "model": "passbook_policies_expression.expressionpolicy",
             "attrs": {
-                "fields": [
-                    "1ff91927-e33d-4615-95b0-c258e5f0df62"
-                ]
+                "name": "default-password-change-password-equal",
+                "expression": "# Check that both passwords are equal.\nreturn request.context['password'] == request.context['password_repeat']"
+            }
+        },
+        {
+            "identifiers": {
+                "pk": "e54045a7-6ecb-4ad9-ad37-28e72d8e565e",
+                "name": "default-recovery-identification"
+            },
+            "model": "passbook_stages_identification.identificationstage",
+            "attrs": {
+                "user_fields": [
+                    "email",
+                    "username"
+                ],
+                "template": "stages/identification/recovery.html",
+                "enrollment_flow": null,
+                "recovery_flow": null
             }
         },
         {
@@ -104,6 +118,9 @@
                 "fields": [
                     "7db91ee8-4290-4e08-8d39-63f132402515",
                     "d30b5eb4-7787-4072-b1ba-65b46e928920"
+                ],
+                "validation_policies": [
+                    "cd042fc6-cc92-4b98-b7e6-f4729df798d8"
                 ]
             }
         },
@@ -121,7 +138,7 @@
             "identifiers": {
                 "pk": "7af7558e-2196-4b9f-a08e-d38420b7cfbb",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
-                "stage": "2390c8be-203a-40f9-acf1-6665fb4be23c",
+                "stage": "e54045a7-6ecb-4ad9-ad37-28e72d8e565e",
                 "order": 0
             },
             "model": "passbook_flows.flowstagebinding",
@@ -145,7 +162,7 @@
             "identifiers": {
                 "pk": "1219d06e-2c06-4c5b-a162-78e3959c6cf0",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
-                "stage": "f0b2ab09-759c-47b0-9d2a-3470e7912b71",
+                "stage": "975d5502-1e22-4d10-b560-fbc5bd70ff4d",
                 "order": 2
             },
             "model": "passbook_flows.flowstagebinding",
@@ -176,29 +193,6 @@
             "attrs": {
                 "re_evaluate_policies": false
             }
-        },
-        {
-            "identifiers": {
-                "pk": "cd042fc6-cc92-4b98-b7e6-f4729df798d8"
-            },
-            "model": "passbook_policies_expression.expressionpolicy",
-            "attrs": {
-                "name": "default-password-change-password-equal",
-                "expression": "# Check that both passwords are equal.\nreturn request.context['password'] == request.context['password_repeat']"
-            }
-        },
-        {
-            "identifiers": {
-                "pk": "ed3fc35e-4b6b-499e-b82b-bb2a90ac70b7",
-                "policy": "cd042fc6-cc92-4b98-b7e6-f4729df798d8",
-                "target": "975d5502-1e22-4d10-b560-fbc5bd70ff4d",
-                "order": 0
-            },
-            "model": "passbook_policies.policybinding",
-            "attrs": {
-                "enabled": true,
-                "timeout": 30
-            }
         }
     ]
 }