diff --git a/backend/src/ee/routes/v1/pki-acme-router.ts b/backend/src/ee/routes/v1/pki-acme-router.ts
index 6344809d0..329a381e3 100644
--- a/backend/src/ee/routes/v1/pki-acme-router.ts
+++ b/backend/src/ee/routes/v1/pki-acme-router.ts
@@ -421,7 +421,7 @@ export const registerPkiAcmeRouter = async (server: FastifyZodProvider) => {
     }
   });
 
-  // POST /api/v1/pki/acme/profiles/<profile_id>/authorizations/<authz_id>/challenges/http-01
+  // POST /api/v1/pki/acme/profiles/<profile_id>/authorizations/<authz_id>/challenges/<challenge_id>
   // Respond to Challenge (RFC 8555 Section 7.5.1)
   server.route({
     method: "POST",
diff --git a/backend/src/ee/services/pki-acme/pki-acme-service.ts b/backend/src/ee/services/pki-acme/pki-acme-service.ts
index cca7c0957..d6cf92a48 100644
--- a/backend/src/ee/services/pki-acme/pki-acme-service.ts
+++ b/backend/src/ee/services/pki-acme/pki-acme-service.ts
@@ -388,7 +388,7 @@ export const pkiAcmeServiceFactory = ({
     //       if we do, return the existing order
 
     const order = await acmeOrderDAL.transaction(async (tx) => {
-      const account = await acmeAccountDAL.findByProjectIdAndAccountId(profileId, accountId)!;
+      const account = (await acmeAccountDAL.findByProjectIdAndAccountId(profileId, accountId))!;
       const createdOrder = await acmeOrderDAL.create(
         {
           accountId: account.id,
@@ -585,7 +585,7 @@ export const pkiAcmeServiceFactory = ({
             type: challenge.type,
             url: buildUrl(profileId, `/authorizations/${authzId}/challenges/${challenge.id}`),
             status: challenge.status,
-            token: auth.token
+            token: auth.token!
           };
         })
       },