diff --git a/lib/classes/oauth2/issuer.php b/lib/classes/oauth2/issuer.php
index 6563c5cb310..f54dbd4ea28 100644
--- a/lib/classes/oauth2/issuer.php
+++ b/lib/classes/oauth2/issuer.php
@@ -219,7 +219,9 @@ class issuer extends persistent {
      * @return lang_string|boolean
      */
     protected function validate_baseurl($value) {
-        if (!empty($value) && strpos($value, 'https://') !== 0) {
+        global $CFG;
+        include_once($CFG->dirroot . '/lib/validateurlsyntax.php');
+        if (!empty($value) && !validateUrlSyntax($value, 'S+')) {
             return new lang_string('sslonlyaccess', 'error');
         }
         return true;