diff --git a/src/api/v0/index.js b/src/api/v0/index.js
index f25e39a..664ae03 100644
--- a/src/api/v0/index.js
+++ b/src/api/v0/index.js
@@ -30,7 +30,7 @@ more information on this, and how to apply and follow the GNU AGPL, see <https:/
 import express from 'express'
 import { check, validationResult } from 'express-validator'
 import Ajv from 'ajv'
-import { generateWKDProfile, generateHKPProfile } from '../../server/index.js'
+import { generateWKDProfile, generateHKPProfile, generateAutoProfile } from '../../server/index.js'
 import * as dotenv from 'dotenv'
 dotenv.config()
 
@@ -310,11 +310,7 @@ router.get('/profile/fetch',
         data = await generateHKPProfile(req.query.query)
         break
       default:
-        if (req.query.query.includes('@')) {
-          data = await generateWKDProfile(req.query.query)
-        } else {
-          data = await generateHKPProfile(req.query.query)
-        }
+        data = await generateAutoProfile(req.query.query)
         break
     }
 
diff --git a/src/api/v2/keyoxide_profile.js b/src/api/v2/keyoxide_profile.js
index 72fd80f..4bf483d 100644
--- a/src/api/v2/keyoxide_profile.js
+++ b/src/api/v2/keyoxide_profile.js
@@ -30,7 +30,7 @@ more information on this, and how to apply and follow the GNU AGPL, see <https:/
 import express from 'express'
 import { check, validationResult } from 'express-validator'
 import Ajv from 'ajv'
-import { generateWKDProfile, generateHKPProfile } from '../../server/index.js'
+import { generateWKDProfile, generateHKPProfile, generateAutoProfile } from '../../server/index.js'
 import * as dotenv from 'dotenv'
 dotenv.config()
 
@@ -283,11 +283,7 @@ router.get('/fetch',
         data = await generateHKPProfile(req.query.query)
         break
       default:
-        if (req.query.query.includes('@')) {
-          data = await generateWKDProfile(req.query.query)
-        } else {
-          data = await generateHKPProfile(req.query.query)
-        }
+        data = await generateAutoProfile(req.query.query)
         break
     }