diff --git a/lib/classes/oauth2/api.php b/lib/classes/oauth2/api.php
index 4eb1eb8513b..c6aece1b0e8 100644
--- a/lib/classes/oauth2/api.php
+++ b/lib/classes/oauth2/api.php
@@ -332,15 +332,15 @@ class api {
         // Will throw exceptions on validation failures.
         if ($create) {
             $issuer->create();
+
+            // Perform service discovery.
+            $classname = self::get_service_classname($issuer->get('servicetype'));
+            $classname::discover_endpoints($issuer);
+            self::guess_image($issuer);
         } else {
             $issuer->update();
         }
 
-        // Perform service discovery.
-        $classname = self::get_service_classname($issuer->get('servicetype'));
-        $classname::discover_endpoints($issuer);
-        self::guess_image($issuer);
-
         return $issuer;
     }