diff --git a/doc/how-to/how-to-setup-custom-subdomains.md b/doc/how-to/how-to-setup-custom-subdomains.md
index 76ce20968f..30c8d04919 100644
--- a/doc/how-to/how-to-setup-custom-subdomains.md
+++ b/doc/how-to/how-to-setup-custom-subdomains.md
@@ -27,6 +27,8 @@ This guide will walk through the process of setting a custom domain for a new te
 
     The `<TEAM_NAME>.key` file should be kept, we require this for step 5 onwards.
 
+    Please save these files to the PlanX vault on 1Password - this ensures that there's a backup than can be accessed by anybody on the dev team.
+
 
 3. **IT Team** - Provide PlanX with certificates (details in documentation above)
     - Certificates can be provided as individual files, or in an archive format (`.pfx`, `.pkcs12`, `.p12`)
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/EndPoint.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/EndPoint.tsx
index c88057d322..79eedefd4a 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/EndPoint.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/EndPoint.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import { Link } from "react-navi";
+import { Link, useLoadingRoute } from "react-navi";
 import scrollIntoView from "scroll-into-view-if-needed";
 
 import { rootFlowPath } from "../../../../../routes/utils";
@@ -14,24 +14,29 @@ const EndPoint: React.FC<{ text: string }> = ({ text }) => {
 
   const href = rootFlowPath(false);
 
+  const currentPath = rootFlowPath(true);
+  const isLoading = useLoadingRoute();
+
   useEffect(() => {
     if (isStart && el.current) {
+      if (isLoading) return;
+
       scrollIntoView(
         el.current,
         flowLayout === FlowLayout.TOP_DOWN
           ? {
-              scrollMode: "if-needed",
+              scrollMode: "always",
               block: "nearest",
               inline: "center",
             }
           : {
-              scrollMode: "if-needed",
+              scrollMode: "always",
               block: "center",
               inline: "nearest",
             },
       );
     }
-  }, [flowLayout, isStart]);
+  }, [flowLayout, isStart, currentPath, isLoading]);
 
   return (
     <li