diff --git a/src/controller/registry-user.controller/registry-user.controller.js b/src/controller/registry-user.controller/registry-user.controller.js
index b24169f09..fdfa630a8 100644
--- a/src/controller/registry-user.controller/registry-user.controller.js
+++ b/src/controller/registry-user.controller/registry-user.controller.js
@@ -196,7 +196,7 @@ async function createUser (req, res, next) {
     }
 
     const responseMessage = {
-      message: `${body?.user_id} + ' was successfully created.`,
+      message: `${body?.username} was successfully created.`,
       created: returnValue
     }
 
@@ -368,13 +368,18 @@ async function deleteUser (req, res, next) {
     const orgRepo = req.ctx.repositories.getBaseOrgRepository()
     const userUUID = req.ctx.params.identifier
 
-    const user = await userRepo.findOneByUUID(userUUID)
+    const user = await userRepo.findUserByUUID(userUUID)
 
-    await userRepo.deleteByUUID(userUUID)
+    if (!user) {
+      logger.info({ uuid: req.ctx.uuid, message: 'User DNE' })
+      return res.status(404).json(error.userDne(userUUID))
+    }
+
+    await userRepo.deleteUserByUUID(userUUID)
 
     const payload = {
       action: 'delete_registry_user',
-      change: user.user_id + ' was successfully deleted.',
+      change: user.username + ' was successfully deleted.',
       req_UUID: req.ctx.uuid,
       org_UUID: await orgRepo.getOrgUUID(req.ctx.org)
     }
@@ -382,7 +387,7 @@ async function deleteUser (req, res, next) {
     logger.info(JSON.stringify(payload))
 
     const responseMessage = {
-      message: user.user_id + ' was successfully deleted.'
+      message: user.username + ' was successfully deleted.'
     }
 
     return res.status(200).json(responseMessage)
diff --git a/src/controller/registry-user.controller/registry-user.middleware.js b/src/controller/registry-user.controller/registry-user.middleware.js
index 7f24b2a13..6b30b69e0 100644
--- a/src/controller/registry-user.controller/registry-user.middleware.js
+++ b/src/controller/registry-user.controller/registry-user.middleware.js
@@ -4,7 +4,7 @@ function parsePostParams (req, res, next) {
   utils.reqCtxMapping(req, 'body', [])
   utils.reqCtxMapping(req, 'params', ['identifier'])
   utils.reqCtxMapping(req, 'query', [
-    'new_user_id',
+    'new_username',
     'name.first', 'name.last', 'name.middle', 'name.suffix',
     'org_affiliations.add', 'org_affiliations.remove',
     'cve_program_org_membership.add', 'cve_program_org_membership.remove'