diff --git a/ui/app/controllers/jobs/run/index.js b/ui/app/controllers/jobs/run/index.js
index 4c6980c99b2..47536019691 100644
--- a/ui/app/controllers/jobs/run/index.js
+++ b/ui/app/controllers/jobs/run/index.js
@@ -11,7 +11,7 @@ import { inject as service } from '@ember/service';
 export default class RunController extends Controller {
   @service router;
 
-  queryParams = ['template'];
+  queryParams = ['template', 'sourceString', 'disregardNameWarning'];
 
   @action
   handleSaveAsTemplate() {
diff --git a/ui/app/routes/jobs/job/definition.js b/ui/app/routes/jobs/job/definition.js
index aead71582c9..6df6d2fb6dc 100644
--- a/ui/app/routes/jobs/job/definition.js
+++ b/ui/app/routes/jobs/job/definition.js
@@ -25,7 +25,7 @@ export default class DefinitionRoute extends Route {
    *                            specification, variableFlags, and variableLiteral.
    */
   async model({ version }) {
-    version = +version; // query parameter is a string; convert to number
+    version = version ? +version : undefined; // query parameter is a string; convert to number
     /** @type {import('../../../models/job').default} */
     const job = this.modelFor('jobs.job');
     if (!job) return;
diff --git a/ui/app/routes/jobs/run/index.js b/ui/app/routes/jobs/run/index.js
index 5f81cee76a6..8774a86f2a9 100644
--- a/ui/app/routes/jobs/run/index.js
+++ b/ui/app/routes/jobs/run/index.js
@@ -82,6 +82,7 @@ export default class JobsRunIndexRoute extends Route {
       controller.model?.deleteRecord();
       controller.set('template', null);
       controller.set('sourceString', null);
+      controller.set('disregardNameWarning', null);
     }
   }
 }
diff --git a/ui/app/templates/components/job-editor/alert.hbs b/ui/app/templates/components/job-editor/alert.hbs
index f3f88c9ccfb..38159998a80 100644
--- a/ui/app/templates/components/job-editor/alert.hbs
+++ b/ui/app/templates/components/job-editor/alert.hbs
@@ -8,6 +8,9 @@
       <Hds::Alert @type="inline" @color="critical" data-test-error={{@data.error.type}} as |A|>
           <A.Title data-test-error-title>{{conditionally-capitalize @data.error.type true}}</A.Title>
           <A.Description data-test-error-message>{{@data.error.message}}</A.Description>
+          {{#if (eq @data.error.message "Job ID does not match")}}
+            <A.Button @text="Run as a new job instead" @color="primary" @route="jobs.run" @query={{hash sourceString=@data.job._newDefinition disregardNameWarning=true}} />
+          {{/if}}
       </Hds::Alert>
     {{/if}}
     {{#if (and (eq @data.stage "read") @data.hasVariables (eq @data.view "job-spec"))}}
@@ -31,4 +34,3 @@
       </Hds::Alert>
     {{/if}}
   </div>
-  
\ No newline at end of file
diff --git a/ui/app/templates/jobs/run/index.hbs b/ui/app/templates/jobs/run/index.hbs
index 56beae01aec..3532ed3a1c1 100644
--- a/ui/app/templates/jobs/run/index.hbs
+++ b/ui/app/templates/jobs/run/index.hbs
@@ -6,7 +6,7 @@
 <Breadcrumb @crumb={{hash label="Run" args=(array "jobs.run")}} />
 {{page-title "Run a job"}}
 <section class="section">
-  {{#if this.sourceString}}
+  {{#if (and this.sourceString (not this.disregardNameWarning))}}
     <Hds::Alert @type="inline" @color="warning" as |A|>
       <A.Title>Don't forget to change the job name!</A.Title>
       <A.Description>Since you're cloning a job version's source as a new job, you'll want to change the job name. Otherwise, this will appear as a new version of the original job, rather than a new job.</A.Description>