diff --git a/web/src/elements/forms/DeleteForm.ts b/web/src/elements/forms/DeleteForm.ts
index 2368fecdd..e0d8741d9 100644
--- a/web/src/elements/forms/DeleteForm.ts
+++ b/web/src/elements/forms/DeleteForm.ts
@@ -59,7 +59,7 @@ export class DeleteForm extends ModalButton {
         <section class="pf-c-page__main-section pf-m-light">
             <form class="pf-c-form pf-m-horizontal">
                 <p>
-                    ${t`Are you sure you want to delete ${this.objectLabel} '${this.obj?.name}'?`}
+                    ${t`Are you sure you want to delete ${this.objectLabel} "${this.obj?.name}"?`}
                 </p>
             </form>
         </section>
diff --git a/web/src/elements/router/Router404.ts b/web/src/elements/router/Router404.ts
index 51cdef1cb..70e618694 100644
--- a/web/src/elements/router/Router404.ts
+++ b/web/src/elements/router/Router404.ts
@@ -20,7 +20,7 @@ export class Router404 extends LitElement {
                 <i class="fas fa-question-circle pf-c-empty-state__icon" aria-hidden="true"></i>
                 <h1 class="pf-c-title pf-m-lg">${t`Not found`}</h1>
                 <div class="pf-c-empty-state__body">
-                    ${t`The URL '${this.url}' was not found.`}
+                    ${t`The URL "${this.url}" was not found.`}
                 </div>
                 <a href="#/" class="pf-c-button pf-m-primary" type="button">${t`Return home`}</a>
             </div>
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 3ad53a0fa..8245b128a 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -189,12 +189,12 @@ msgstr ""
 "This will cause all policies to be re-evaluated on their next usage."
 
 #: src/elements/forms/DeleteForm.ts:62
-msgid "Are you sure you want to delete {0} '{1}'?"
-msgstr "Are you sure you want to delete {0} '{1}'?"
+msgid "Are you sure you want to delete {0} \"{1}\"?"
+msgstr "Are you sure you want to delete {0} \"{1}\"?"
 
 #: src/pages/users/UserActiveForm.ts:52
-msgid "Are you sure you want to update {0} '{1}'?"
-msgstr "Are you sure you want to update {0} '{1}'?"
+msgid "Are you sure you want to update {0} \"{1}\"?"
+msgstr "Are you sure you want to update {0} \"{1}\"?"
 
 #: src/pages/providers/saml/SAMLProviderForm.ts:202
 msgid "Assertion not valid on or after current time + this value (Format: hours=1;minutes=2;seconds=3)."
@@ -3123,8 +3123,8 @@ msgid "Text: Simple Text input"
 msgstr "Text: Simple Text input"
 
 #: src/elements/router/Router404.ts:26
-msgid "The URL '{0}' was not found."
-msgstr "The URL '{0}' was not found."
+msgid "The URL \"{0}\" was not found."
+msgstr "The URL \"{0}\" was not found."
 
 #: src/pages/policies/dummy/DummyPolicyForm.ts:86
 msgid "The policy takes a random time to execute. This controls the minimum time it will take."
@@ -3690,8 +3690,8 @@ msgid "{0}"
 msgstr "{0}"
 
 #: src/pages/stages/prompt/PromptStageForm.ts:77
-msgid "{0} ('{1}', Type {2})"
-msgstr "{0} ('{1}', Type {2})"
+msgid "{0} (\"{1}\", Type {2})"
+msgstr "{0} (\"{1}\", Type {2})"
 
 #: src/pages/stages/prompt/PromptStageForm.ts:97
 msgid "{0} ({1})"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 6dd39d0f2..539a8bf84 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -185,11 +185,11 @@ msgid ""
 msgstr ""
 
 #: src/elements/forms/DeleteForm.ts:62
-msgid "Are you sure you want to delete {0} '{1}'?"
+msgid "Are you sure you want to delete {0} \"{1}\"?"
 msgstr ""
 
 #: src/pages/users/UserActiveForm.ts:52
-msgid "Are you sure you want to update {0} '{1}'?"
+msgid "Are you sure you want to update {0} \"{1}\"?"
 msgstr ""
 
 #: src/pages/providers/saml/SAMLProviderForm.ts:202
@@ -3119,7 +3119,7 @@ msgid "Text: Simple Text input"
 msgstr ""
 
 #: src/elements/router/Router404.ts:26
-msgid "The URL '{0}' was not found."
+msgid "The URL \"{0}\" was not found."
 msgstr ""
 
 #: src/pages/policies/dummy/DummyPolicyForm.ts:86
@@ -3684,7 +3684,7 @@ msgid "{0}"
 msgstr ""
 
 #: src/pages/stages/prompt/PromptStageForm.ts:77
-msgid "{0} ('{1}', Type {2})"
+msgid "{0} (\"{1}\", Type {2})"
 msgstr ""
 
 #: src/pages/stages/prompt/PromptStageForm.ts:97
diff --git a/web/src/pages/stages/StageListPage.ts b/web/src/pages/stages/StageListPage.ts
index 7e55527a4..db25eaa82 100644
--- a/web/src/pages/stages/StageListPage.ts
+++ b/web/src/pages/stages/StageListPage.ts
@@ -100,7 +100,7 @@ export class StageListPage extends TablePage<Stage> {
             </ak-forms-modal>
             <ak-forms-delete
                 .obj=${item}
-                objectLabel=${item.verboseName}
+                objectLabel=${item.verboseName || ""}
                 .delete=${() => {
                     return new StagesApi(DEFAULT_CONFIG).stagesAllDelete({
                         stageUuid: item.pk || ""
diff --git a/web/src/pages/stages/prompt/PromptStageForm.ts b/web/src/pages/stages/prompt/PromptStageForm.ts
index 7cb3a1af1..1e3963d98 100644
--- a/web/src/pages/stages/prompt/PromptStageForm.ts
+++ b/web/src/pages/stages/prompt/PromptStageForm.ts
@@ -70,7 +70,7 @@ export class PromptStageForm extends Form<PromptStage> {
                                         return su == prompt.pk;
                                     });
                                     return html`<option value=${ifDefined(prompt.pk)} ?selected=${selected}>
-                                        ${t`${prompt.fieldKey} ('${prompt.label}', Type ${prompt.type})`}
+                                        ${t`${prompt.fieldKey} ("${prompt.label}", Type ${prompt.type})`}
                                     </option>`;
                                 });
                             }), html`<option>${t`Loading...`}</option>`)}
diff --git a/web/src/pages/users/UserActiveForm.ts b/web/src/pages/users/UserActiveForm.ts
index 753a7750a..04ff13c55 100644
--- a/web/src/pages/users/UserActiveForm.ts
+++ b/web/src/pages/users/UserActiveForm.ts
@@ -37,7 +37,7 @@ export class UserActiveForm extends DeleteForm {
                         <div class="pf-c-card__body">
                             <form class="pf-c-form pf-m-horizontal">
                                 <p>
-                                    ${t`Are you sure you want to update ${this.objectLabel} '${this.obj?.name}'?`}
+                                    ${t`Are you sure you want to update ${this.objectLabel} "${this.obj?.name}"?`}
                                 </p>
                             </form>
                         </div>