diff --git a/admin/webservice/forms.php b/admin/webservice/forms.php
index 785e115e31d91..41c15c25e0d13 100644
--- a/admin/webservice/forms.php
+++ b/admin/webservice/forms.php
@@ -158,9 +158,12 @@ function validation($data, $files) {
         $errors = parent::validation($data, $files);
 
         // Add field validation check for duplicate shortname.
-        if ($service = $DB->get_record('external_services', array('shortname' => $data['shortname']), '*', IGNORE_MULTIPLE)) {
-            if (empty($data['id']) || $service->id != $data['id']) {
-                $errors['shortname'] = get_string('shortnametaken', 'webservice', $service->name);
+        // Allow duplicated "empty" shortnames.
+        if (!empty($data['shortname'])) {
+            if ($service = $DB->get_record('external_services', array('shortname' => $data['shortname']), '*', IGNORE_MULTIPLE)) {
+                if (empty($data['id']) || $service->id != $data['id']) {
+                    $errors['shortname'] = get_string('shortnametaken', 'webservice', $service->name);
+                }
             }
         }
 
diff --git a/admin/webservice/service.php b/admin/webservice/service.php
index 0abf9d0be023d..d99bf58fbc2cc 100644
--- a/admin/webservice/service.php
+++ b/admin/webservice/service.php
@@ -84,7 +84,6 @@
             'objectid' => $servicedata->id
         );
         $event = \core\event\webservice_service_created::create($params);
-        $event->add_record_snapshot('external_services', $servicedata);
         $event->trigger();
 
         //redirect to the 'add functions to service' page
@@ -99,7 +98,6 @@
             'objectid' => $servicedata->id
         );
         $event = \core\event\webservice_service_updated::create($params);
-        $event->add_record_snapshot('external_services', $servicedata);
         $event->trigger();
     }