diff --git a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.service.ts
index 11a090ad5105..430c5c7cc47b 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/criminal-record-submission.service.ts
@@ -2,11 +2,7 @@ import { Injectable } from '@nestjs/common'
 import { SharedTemplateApiService } from '../../shared'
 import { TemplateApiModuleActionProps } from '../../../types'
 import { CriminalRecordService } from '@island.is/api/domains/criminal-record'
-import {
-  SyslumennService,
-  Person,
-  PersonType,
-} from '@island.is/clients/syslumenn'
+import { SyslumennService, PersonType } from '@island.is/clients/syslumenn'
 import {
   ApplicationTypes,
   ApplicationWithAttachments as Application,
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/emailGenerators/syslumennNotifyError.ts b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/emailGenerators/syslumennNotifyError.ts
index b91aa0c7a01a..d22cdc6e094e 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/emailGenerators/syslumennNotifyError.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/criminal-record-submission/emailGenerators/syslumennNotifyError.ts
@@ -1,5 +1,4 @@
 import { EmailTemplateGenerator } from '../../../../types'
-import { NationalRegistry } from '../types'
 
 export const generateSyslumennNotifyErrorEmail: EmailTemplateGenerator = (
   props,
@@ -11,12 +10,9 @@ export const generateSyslumennNotifyErrorEmail: EmailTemplateGenerator = (
 
   const syslumennEmail = 'vefur@syslumenn.is'
 
-  const nationalRegistryData = application.externalData.nationalRegistry
-    ?.data as NationalRegistry
-
   const subject = 'Umsókn um sakavottorð'
   const body = `
-      Villa hefur komið upp í samskiptum milli island.is og sýslumanna, vegna kaupa á sakavottorði fyrir ${nationalRegistryData.nationalId}.
+      Villa hefur komið upp í samskiptum milli island.is og sýslumanna, vegna kaupa á sakavottorði fyrir ${application.applicant}.
       `
 
   return {
diff --git a/libs/application/templates/criminal-record/src/lib/messages.ts b/libs/application/templates/criminal-record/src/lib/messages.ts
index 8ae494dbfdb7..f35e8e3b606c 100644
--- a/libs/application/templates/criminal-record/src/lib/messages.ts
+++ b/libs/application/templates/criminal-record/src/lib/messages.ts
@@ -31,18 +31,6 @@ export const m = defineMessages({
     defaultMessage: 'Ég hef kynnt mér ofangreint',
     description: 'I understand',
   },
-  nationalRegistryTitle: {
-    id: 'cr.application:nationalRegistry.title',
-    defaultMessage: 'Persónuupplýsingar úr Þjóðskrá',
-    description: 'Personal information from the National Registry',
-  },
-  nationalRegistrySubTitle: {
-    id: 'cr.application:nationalRegistry.subTitle',
-    defaultMessage:
-      'Til þess að auðvelda fyrir sækjum við persónuupplýsingar úr Þjóðskrá til þess að fylla út umsóknina',
-    description:
-      'Information from the National Registry will be used to prefill the data in the application',
-  },
   userProfileInformationTitle: {
     id: 'cr.application:userprofile.title',
     defaultMessage: 'Netfang og símanúmer úr þínum stillingum',