diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index ec217a321012..1b1aa6f66c93 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -213,9 +213,10 @@ export interface User extends QuotaUsageResponse {
 }
 
 export interface AnonymousUser {
+    id?: string;
     isAnonymous: true;
-    username?: string;
     is_admin?: false;
+    username?: string;
 }
 
 export type GenericUser = User | AnonymousUser;
diff --git a/client/src/components/LoadingSpan.vue b/client/src/components/LoadingSpan.vue
index 3babd0a618d7..527dc6c39e85 100644
--- a/client/src/components/LoadingSpan.vue
+++ b/client/src/components/LoadingSpan.vue
@@ -1,7 +1,9 @@
 <template>
     <span>
         <span :class="spinnerClasses" title="loading"></span>
-        <span v-if="!spinnerOnly" class="loading-message">{{ message }}.<span class="blinking">..</span></span>
+        <span v-if="!spinnerOnly" class="loading-message" data-description="loading message">
+            {{ message }}.<span class="blinking">..</span>
+        </span>
     </span>
 </template>
 <script>
diff --git a/client/src/components/Workflow/Run/WorkflowRun.test.js b/client/src/components/Workflow/Run/WorkflowRun.test.js
index 3d39b78251a8..55c613d528d0 100644
--- a/client/src/components/Workflow/Run/WorkflowRun.test.js
+++ b/client/src/components/Workflow/Run/WorkflowRun.test.js
@@ -1,7 +1,7 @@
 import { createTestingPinia } from "@pinia/testing";
-import { createLocalVue, shallowMount } from "@vue/test-utils";
+import { createLocalVue, mount } from "@vue/test-utils";
+import flushPromises from "flush-promises";
 import { PiniaVuePlugin } from "pinia";
-import { watchForChange } from "tests/jest/helpers";
 
 import { getRunData } from "./services";
 import sampleRunData1 from "./testdata/run1.json";
@@ -35,7 +35,7 @@ describe("WorkflowRun.vue", () => {
         const propsData = { workflowId: run1WorkflowId };
         localVue = createLocalVue();
         localVue.use(PiniaVuePlugin);
-        wrapper = shallowMount(WorkflowRun, {
+        wrapper = mount(WorkflowRun, {
             propsData: propsData,
             localVue,
             pinia: createTestingPinia(),
@@ -43,29 +43,28 @@ describe("WorkflowRun.vue", () => {
     });
 
     it("loads run data from API and parses it into a WorkflowRunModel object", async () => {
-        // waits for vue to render wrapper
-        await localVue.nextTick();
-
-        expect(wrapper.vm.loading).toBe(true);
-        expect(wrapper.vm.error).toBeNull();
-        expect(wrapper.vm.model).toBeNull();
+        const loadingTag = "[data-description='loading message']";
+        expect(wrapper.find(loadingTag).exists()).toBeTruthy();
+        expect(wrapper.vm.workflowError).toBe("");
+        expect(wrapper.vm.workflowModel).toBeNull();
 
-        await watchForChange({ vm: wrapper.vm, propName: "loading" });
+        await flushPromises();
+        await wrapper.vm.$nextTick();
 
-        expect(wrapper.vm.error).toBeNull();
-        expect(wrapper.vm.loading).toBe(false);
+        expect(wrapper.find(loadingTag).exists()).toBeFalsy();
         expect(wrapper.vm.simpleForm).toBe(false);
-        const model = wrapper.vm.model;
-        expect(model).not.toBeNull();
-        expect(model.workflowId).toBe(run1WorkflowId);
-        expect(model.name).toBe("Cool Test Workflow");
-        expect(model.historyId).toBe("8f7a155755f10e73");
-        expect(model.hasUpgradeMessages).toBe(false);
-        expect(model.hasStepVersionChanges).toBe(false);
-        expect(model.wpInputs.wf_param.label).toBe("wf_param");
+
+        const workflowModel = wrapper.vm.workflowModel;
+        expect(workflowModel).not.toBeNull();
+        expect(workflowModel.workflowId).toBe(run1WorkflowId);
+        expect(workflowModel.name).toBe("Cool Test Workflow");
+        expect(workflowModel.historyId).toBe("8f7a155755f10e73");
+        expect(workflowModel.hasUpgradeMessages).toBe(false);
+        expect(workflowModel.hasStepVersionChanges).toBe(false);
+        expect(workflowModel.wpInputs.wf_param.label).toBe("wf_param");
         // all steps are expanded since data and parameter steps are expanded by default,
         // the same is true for tools with unconnected data inputs.
-        model.steps.forEach((step) => {
+        workflowModel.steps.forEach((step) => {
             expect(step.expanded).toBe(true);
         });
     });
@@ -75,17 +74,20 @@ describe("WorkflowRun.vue", () => {
         await localVue.nextTick();
 
         expect(wrapper.vm.loading).toBe(true);
-        expect(wrapper.vm.error).toBeNull();
-        expect(wrapper.vm.model).toBeNull();
+        expect(wrapper.vm.workflowError).toBe("");
+        expect(wrapper.vm.workflowModel).toBeNull();
 
-        await watchForChange({ vm: wrapper.vm, propName: "loading" });
+        await flushPromises();
+        await wrapper.vm.$nextTick();
 
-        expect(wrapper.vm.error).toBeNull();
+        expect(wrapper.vm.workflowError).toBe("");
         expect(wrapper.vm.loading).toBe(false);
-        expect(wrapper.find("b-alert-stub").exists()).toBe(false);
+        expect(wrapper.find(".alert-danger").exists()).toBe(false);
         wrapper.vm.handleSubmissionError("Some exception here");
+
         await localVue.nextTick();
+
         expect(wrapper.vm.submissionError).toBe("Some exception here");
-        expect(wrapper.find("b-alert-stub").attributes("variant")).toEqual("danger");
+        expect(wrapper.find(".alert-danger").exists()).toBe(true);
     });
 });
diff --git a/client/src/components/Workflow/Run/WorkflowRun.vue b/client/src/components/Workflow/Run/WorkflowRun.vue
index 8ab28c028b09..cce942b988b4 100644
--- a/client/src/components/Workflow/Run/WorkflowRun.vue
+++ b/client/src/components/Workflow/Run/WorkflowRun.vue
@@ -1,176 +1,192 @@
+<script setup lang="ts">
+import { BAlert, BLink } from "bootstrap-vue";
+import { storeToRefs } from "pinia";
+import { computed, onMounted, ref, watch } from "vue";
+import { RouterLink } from "vue-router";
+import { useRouter } from "vue-router/composables";
+
+import { copyWorkflow } from "@/components/Workflow/workflows.services";
+import { useHistoryItemsStore } from "@/stores/historyItemsStore";
+import { useHistoryStore } from "@/stores/historyStore";
+import { useUserStore } from "@/stores/userStore";
+import { errorMessageAsString } from "@/utils/simple-error";
+
+import { WorkflowRunModel } from "./model";
+import { getRunData } from "./services";
+
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import WorkflowRunForm from "@/components/Workflow/Run/WorkflowRunForm.vue";
+import WorkflowRunFormSimple from "@/components/Workflow/Run/WorkflowRunFormSimple.vue";
+import WorkflowRunSuccess from "@/components/Workflow/Run/WorkflowRunSuccess.vue";
+
+const historyStore = useHistoryStore();
+const historyItemsStore = useHistoryItemsStore();
+const { currentUser } = storeToRefs(useUserStore());
+const router = useRouter();
+
+interface Props {
+    workflowId: string;
+    preferSimpleForm?: boolean;
+    simpleFormTargetHistory?: string;
+    simpleFormUseJobCache?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    preferSimpleForm: false,
+    simpleFormTargetHistory: "current",
+    simpleFormUseJobCache: false,
+});
+
+const loading = ref(true);
+const hasUpgradeMessages = ref(false);
+const hasStepVersionChanges = ref(false);
+const invocations = ref([]);
+const simpleForm = ref(false);
+const submissionError = ref("");
+const workflowError = ref("");
+const workflowName = ref("");
+const workflowModel: any = ref(null);
+
+const currentHistoryId = computed(() => historyStore.currentHistoryId);
+const editorLink = computed(() => `/workflows/edit?id=${props.workflowId}`);
+const historyStatusKey = computed(() => `${currentHistoryId.value}_${lastUpdateTime.value}`);
+const isOwner = computed(() => currentUser.value?.username === workflowModel.value.runData.owner);
+const lastUpdateTime = computed(() => historyItemsStore.lastUpdateTime);
+
+function handleInvocations(incomingInvocations: any) {
+    invocations.value = incomingInvocations;
+    // make sure any new histories are added to historyStore
+    invocations.value.forEach((invocation: any) => {
+        historyStore.getHistoryById(invocation.history_id);
+    });
+}
+
+function handleSubmissionError(error: string) {
+    submissionError.value = errorMessageAsString(error);
+}
+
+function loadRun() {
+    getRunData(props.workflowId)
+        .then((runData) => {
+            const incomingModel = new WorkflowRunModel(runData);
+            simpleForm.value = props.preferSimpleForm;
+            if (simpleForm.value) {
+                // These only work with PJA - the API doesn't evaluate them at
+                // all outside that context currently. The main workflow form renders
+                // these dynamically and takes care of all the validation and setup details
+                // on the frontend. If these are implemented on the backend at some
+                // point this restriction can be lifted.
+                if (incomingModel.hasReplacementParametersInToolForm) {
+                    console.log("cannot render simple workflow form - has ${} values in tool steps");
+                    simpleForm.value = false;
+                }
+                // If there are required parameters in a tool form (a disconnected runtime
+                // input), we have to render the tool form steps and cannot use the
+                // simplified tool form.
+                if (incomingModel.hasOpenToolSteps) {
+                    console.log(
+                        "cannot render simple workflow form - one or more tools have disconnected runtime inputs"
+                    );
+                    simpleForm.value = false;
+                }
+                // Just render the whole form for resource request parameters (kind of
+                // niche - I'm not sure anyone is using these currently anyway).
+                if (incomingModel.hasWorkflowResourceParameters) {
+                    console.log(`Cannot render simple workflow form - workflow resource parameters are configured`);
+                    simpleForm.value = false;
+                }
+            }
+            hasUpgradeMessages.value = incomingModel.hasUpgradeMessages;
+            hasStepVersionChanges.value = incomingModel.hasStepVersionChanges;
+            workflowName.value = incomingModel.name;
+            workflowModel.value = incomingModel;
+            loading.value = false;
+        })
+        .catch((response) => {
+            workflowError.value = errorMessageAsString(response);
+        });
+}
+
+async function onImport() {
+    const response = await copyWorkflow(props.workflowId, workflowModel.value.runData.owner);
+    router.push(`/workflows/edit?id=${response.id}`);
+}
+
+function showAdvanced() {
+    simpleForm.value = false;
+}
+
+onMounted(() => {
+    loadRun();
+});
+
+watch(
+    () => historyStatusKey.value,
+    () => {
+        if (invocations.value.length === 0) {
+            loadRun();
+        }
+    }
+);
+
+defineExpose({
+    loading,
+    simpleForm,
+    submissionError,
+    handleSubmissionError,
+    workflowError,
+    workflowModel,
+});
+</script>
+
 <template>
     <span>
-        <b-alert v-if="error" variant="danger" show>
+        <BAlert v-if="workflowError" variant="danger" show>
             <h2 class="h-text">Workflow cannot be executed. Please resolve the following issue:</h2>
-            {{ error }}
-        </b-alert>
+            {{ workflowError }}
+        </BAlert>
         <span v-else>
-            <b-alert v-if="loading" variant="info" show>
+            <BAlert v-if="loading" variant="info" show>
                 <LoadingSpan message="Loading workflow run data" />
-            </b-alert>
-            <WorkflowRunSuccess v-else-if="!!invocations" :invocations="invocations" :workflow-name="workflowName" />
+            </BAlert>
+            <WorkflowRunSuccess
+                v-else-if="invocations.length > 0"
+                :invocations="invocations"
+                :workflow-name="workflowName" />
             <div v-else class="ui-form-composite">
-                <div class="ui-form-composite-messages mb-4">
-                    <b-alert v-if="hasUpgradeMessages" variant="warning" show>
-                        Some tools in this workflow may have changed since it was last saved or some errors were found.
-                        The workflow may still run, but any new options will have default values. Please review the
-                        messages below to make a decision about whether the changes will affect your analysis.
-                    </b-alert>
-                    <b-alert v-if="hasStepVersionChanges" variant="warning" show>
-                        Some tools are being executed with different versions compared to those available when this
-                        workflow was last saved because the other versions are not or no longer available on this Galaxy
-                        instance. To upgrade your workflow and dismiss this message simply edit the workflow and re-save
-                        it.
-                    </b-alert>
-                    <b-alert v-if="submissionError" variant="danger" show>
+                <BAlert
+                    v-if="hasUpgradeMessages || hasStepVersionChanges"
+                    class="mb-4"
+                    variant="warning"
+                    show
+                    data-description="workflow run warning">
+                    <span>
+                        The <b>`{{ workflowName }}`</b> workflow may contain tools which have changed since it was last
+                        saved or some other problems have been detected. Please
+                    </span>
+                    <RouterLink v-if="isOwner" :to="editorLink">click here to edit and review the issues</RouterLink>
+                    <BLink v-else @click="onImport">click here to import the workflow and review the issues</BLink>
+                    <span>before running this workflow.</span>
+                </BAlert>
+                <div v-else>
+                    <BAlert v-if="submissionError" class="mb-4" variant="danger" show>
                         Workflow submission failed: {{ submissionError }}
-                    </b-alert>
+                    </BAlert>
+                    <WorkflowRunFormSimple
+                        v-else-if="simpleForm"
+                        :model="workflowModel"
+                        :target-history="simpleFormTargetHistory"
+                        :use-job-cache="simpleFormUseJobCache"
+                        @submissionSuccess="handleInvocations"
+                        @submissionError="handleSubmissionError"
+                        @showAdvanced="showAdvanced" />
+                    <WorkflowRunForm
+                        v-else
+                        :model="workflowModel"
+                        @submissionSuccess="handleInvocations"
+                        @submissionError="handleSubmissionError" />
                 </div>
-                <WorkflowRunFormSimple
-                    v-if="simpleForm"
-                    :model="model"
-                    :target-history="simpleFormTargetHistory"
-                    :use-job-cache="simpleFormUseJobCache"
-                    @submissionSuccess="handleInvocations"
-                    @submissionError="handleSubmissionError"
-                    @showAdvanced="showAdvanced" />
-                <WorkflowRunForm
-                    v-else
-                    :model="model"
-                    @submissionSuccess="handleInvocations"
-                    @submissionError="handleSubmissionError" />
             </div>
         </span>
     </span>
 </template>
-
-<script>
-import LoadingSpan from "components/LoadingSpan";
-import { mapState } from "pinia";
-import { useHistoryItemsStore } from "stores/historyItemsStore";
-import { errorMessageAsString } from "utils/simple-error";
-
-import { useHistoryStore } from "@/stores/historyStore";
-
-import { WorkflowRunModel } from "./model";
-import { getRunData } from "./services";
-import WorkflowRunForm from "./WorkflowRunForm";
-import WorkflowRunFormSimple from "./WorkflowRunFormSimple";
-import WorkflowRunSuccess from "./WorkflowRunSuccess";
-
-export default {
-    components: {
-        LoadingSpan,
-        WorkflowRunSuccess,
-        WorkflowRunForm,
-        WorkflowRunFormSimple,
-    },
-    props: {
-        workflowId: {
-            type: String,
-            required: true,
-        },
-        preferSimpleForm: {
-            type: Boolean,
-            default: false,
-        },
-        simpleFormTargetHistory: {
-            type: String,
-            default: "current",
-        },
-        simpleFormUseJobCache: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    data() {
-        return {
-            error: null,
-            loading: true,
-            hasUpgradeMessages: false,
-            hasStepVersionChanges: false,
-            workflowName: "",
-            invocations: null,
-            simpleForm: null,
-            submissionError: null,
-            model: null,
-        };
-    },
-    computed: {
-        ...mapState(useHistoryStore, ["currentHistoryId", "getHistoryById"]),
-        ...mapState(useHistoryItemsStore, ["lastUpdateTime"]),
-        historyStatusKey() {
-            return `${this.currentHistoryId}_${this.lastUpdateTime}`;
-        },
-    },
-    watch: {
-        historyStatusKey() {
-            if (!this.invocations) {
-                this.loadRun();
-            }
-        },
-    },
-    created() {
-        this.loadRun();
-    },
-    methods: {
-        handleInvocations(invocations) {
-            this.invocations = invocations;
-            // make sure any new histories are added to historyStore
-            this.invocations.forEach((invocation) => {
-                this.getHistoryById(invocation.history_id);
-            });
-        },
-        handleSubmissionError(error) {
-            this.submissionError = errorMessageAsString(error);
-        },
-        loadRun() {
-            getRunData(this.workflowId)
-                .then((runData) => {
-                    this.loading = false;
-                    const model = new WorkflowRunModel(runData);
-                    let simpleForm = this.preferSimpleForm;
-                    if (simpleForm) {
-                        // These only work with PJA - the API doesn't evaluate them at
-                        // all outside that context currently. The main workflow form renders
-                        // these dynamically and takes care of all the validation and setup details
-                        // on the frontend. If these are implemented on the backend at some
-                        // point this restriction can be lifted.
-                        if (model.hasReplacementParametersInToolForm) {
-                            console.log("cannot render simple workflow form - has ${} values in tool steps");
-                            simpleForm = false;
-                        }
-                        // If there are required parameters in a tool form (a disconnected runtime
-                        // input), we have to render the tool form steps and cannot use the
-                        // simplified tool form.
-                        if (model.hasOpenToolSteps) {
-                            console.log(
-                                "cannot render simple workflow form - one or more tools have disconnected runtime inputs"
-                            );
-                            simpleForm = false;
-                        }
-                        // Just render the whole form for resource request parameters (kind of
-                        // niche - I'm not sure anyone is using these currently anyway).
-                        if (model.hasWorkflowResourceParameters) {
-                            console.log(
-                                `Cannot render simple workflow form - workflow resource parameters are configured`
-                            );
-                            simpleForm = false;
-                        }
-                    }
-                    this.simpleForm = simpleForm;
-                    this.model = model;
-                    this.hasUpgradeMessages = model.hasUpgradeMessages;
-                    this.hasStepVersionChanges = model.hasStepVersionChanges;
-                    this.workflowName = this.model.name;
-                })
-                .catch((response) => {
-                    this.error = errorMessageAsString(response);
-                });
-        },
-        showAdvanced() {
-            this.simpleForm = false;
-        },
-    },
-};
-</script>
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 258da5b54560..5b41b7e2200e 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -662,7 +662,7 @@ trs_import:
 
 workflow_run:
   selectors:
-    warning: ".ui-form-composite-messages .alert-warning"
+    warning: '[data-description="workflow run warning"]'
     input_div: "[step-label='${label}']"
     input_data_div: "[step-label='${label}'] .multiselect"
     # TODO: put step labels in the DOM ideally
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index 563314260d00..35089bc5e4a3 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -1046,6 +1046,7 @@ def _workflow_to_dict_run(self, trans, stored, workflow, history=None):
             "id": trans.app.security.encode_id(stored.id),
             "history_id": trans.app.security.encode_id(history.id) if history else None,
             "name": stored.name,
+            "owner": stored.user.username,
             "steps": step_models,
             "step_version_changes": step_version_changes,
             "has_upgrade_messages": has_upgrade_messages,
diff --git a/lib/galaxy_test/selenium/test_workflow_run.py b/lib/galaxy_test/selenium/test_workflow_run.py
index afb6085b98bf..fea087ac06dc 100644
--- a/lib/galaxy_test/selenium/test_workflow_run.py
+++ b/lib/galaxy_test/selenium/test_workflow_run.py
@@ -177,7 +177,7 @@ def test_execution_with_tool_upgrade(self):
         self.workflow_run_with_name(name)
         self.sleep_for(self.wait_types.UX_TRANSITION)
         # Check that this tool form contains a warning about different versions.
-        self.assert_message(self.components.workflow_run.warning, contains="different versions")
+        self.assert_message(self.components.workflow_run.warning, contains="tools which have changed")
         self.screenshot("workflow_run_tool_upgrade")
 
     @selenium_test
@@ -189,7 +189,7 @@ def test_run_form_safe_upgrade_handling(self):
         name = self.workflow_upload_yaml_with_random_name(workflow_with_rules_json, exact_tools=True)
         self.workflow_run_with_name(name)
         self.sleep_for(self.wait_types.UX_TRANSITION)
-        self.assert_message(self.components.workflow_run.warning, contains="different versions")
+        self.assert_message(self.components.workflow_run.warning, contains="tools which have changed")
         # 1.0.0 is a version that exists in WORKFLOW_SAFE_TOOL_VERSION_UPDATES
         workflow_with_rules["steps"]["apply"]["tool_version"] = "1.0.0"
         workflow_with_rules_json = json.dumps(workflow_with_rules)