diff --git a/ghost/admin/app/components/modal-new-webhook.js b/ghost/admin/app/components/modal-webhook-form.js
similarity index 87%
rename from ghost/admin/app/components/modal-new-webhook.js
rename to ghost/admin/app/components/modal-webhook-form.js
index d8eb20fe16..dd538410e2 100644
--- a/ghost/admin/app/components/modal-new-webhook.js
+++ b/ghost/admin/app/components/modal-webhook-form.js
@@ -10,6 +10,8 @@ export default ModalComponent.extend({
     router: service(),
 
     availableEvents: null,
+    buttonText: 'Save',
+    successText: 'Saved',
 
     confirm() {},
 
@@ -24,6 +26,13 @@ export default ModalComponent.extend({
         ];
     },
 
+    didReceiveAttrs() {
+        if (this.webhook.isNew) {
+            this.set('buttonText', 'Create');
+            this.set('successText', 'Created');
+        }
+    },
+
     actions: {
         selectEvent(value) {
             this.webhook.set('event', value);
@@ -31,11 +40,11 @@ export default ModalComponent.extend({
         },
 
         confirm() {
-            this.createWebhook.perform();
+            this.saveWebhook.perform();
         }
     },
 
-    createWebhook: task(function* () {
+    saveWebhook: task(function* () {
         try {
             let webhook = yield this.confirm();
             let integration = yield webhook.get('integration');
diff --git a/ghost/admin/app/templates/components/modal-new-webhook.hbs b/ghost/admin/app/templates/components/modal-webhook-form.hbs
similarity index 95%
rename from ghost/admin/app/templates/components/modal-new-webhook.hbs
rename to ghost/admin/app/templates/components/modal-webhook-form.hbs
index af4878225e..1dd2e08fab 100644
--- a/ghost/admin/app/templates/components/modal-new-webhook.hbs
+++ b/ghost/admin/app/templates/components/modal-webhook-form.hbs
@@ -1,4 +1,4 @@
-<header class="modal-header" data-test-modal="new-webhook">
+<header class="modal-header" data-test-modal="webhook-form">
     <h1>New webhook</h1>
 </header>
 <button class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}</button>
@@ -84,9 +84,9 @@
     <button {{action "closeModal"}} class="gh-btn" data-test-button="cancel-new-webhook">
         <span>Cancel</span>
     </button>
-    {{gh-task-button "Create"
-        successText="Created"
-        task=createWebhook
+    {{gh-task-button buttonText
+        successText=successText
+        task=saveWebhook
         class="gh-btn gh-btn-green gh-btn-icon"
-        data-test-button="create-webhook"}}
+        data-test-button="save-webhook"}}
 </div>
diff --git a/ghost/admin/app/templates/settings/integration/webhooks/new.hbs b/ghost/admin/app/templates/settings/integration/webhooks/new.hbs
index 02290f798c..7f210fbfde 100644
--- a/ghost/admin/app/templates/settings/integration/webhooks/new.hbs
+++ b/ghost/admin/app/templates/settings/integration/webhooks/new.hbs
@@ -1,4 +1,4 @@
-{{gh-fullscreen-modal "new-webhook"
+{{gh-fullscreen-modal "webhook-form"
     model=webhook
     confirm=(action "save")
     close=(action "cancel")
diff --git a/ghost/admin/mirage/config/webhooks.js b/ghost/admin/mirage/config/webhooks.js
index 785cc666f9..3c8010b3fa 100644
--- a/ghost/admin/mirage/config/webhooks.js
+++ b/ghost/admin/mirage/config/webhooks.js
@@ -50,7 +50,7 @@ export default function mockWebhooks(server) {
         if (webhooks.findBy({targetUrl: attrs.targetUrl, event: attrs.event})) {
             errors.push({
                 errorType: 'ValidationError',
-                message: 'Target URL has already used for this event',
+                message: 'Target URL has already been used for this event',
                 property: 'target_url'
             });
         }