diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsRepresentativesSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsRepresentativesSummary.tsx
index 094134e95bc2..1d5d8e767388 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsRepresentativesSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsRepresentativesSummary.tsx
@@ -41,9 +41,9 @@ export const ApplicantsRepresentativesSummary = ({ answers }: Props) => {
           <SummarySection
             sectionLabel={formatMessage(summary.landlordsRepresentativeLabel)}
           >
-            {landlordRepresentatives.map((landlordRep) => {
+            {landlordRepresentatives.map((landlordRep, index) => {
               return (
-                <Fragment key={crypto.randomUUID()}>
+                <Fragment key={`${index}_${landlordRep.nationalId}`}>
                   <GridRow className={gridRow}>
                     <GridColumn span={['12/12']}>
                       <KeyValue
@@ -81,9 +81,9 @@ export const ApplicantsRepresentativesSummary = ({ answers }: Props) => {
           <SummarySection
             sectionLabel={formatMessage(summary.tenantsRepresentativeLabel)}
           >
-            {tenantRepresentatives.map((tenantRep) => {
+            {tenantRepresentatives.map((tenantRep, index) => {
               return (
-                <Fragment key={crypto.randomUUID()}>
+                <Fragment key={`${index}_${tenantRep.nationalId}`}>
                   <GridRow className={gridRow}>
                     <GridColumn span={['12/12']}>
                       <KeyValue
diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsSummary.tsx
index 15f46c186ed4..297490ad9dee 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/ApplicantsSummary.tsx
@@ -36,9 +36,9 @@ export const ApplicantsSummary = ({ answers }: Props) => {
             : formatMessage(summary.landlordsHeader)
         }
       >
-        {landlordListWithoutRepresentatives.map((landlord) => {
+        {landlordListWithoutRepresentatives.map((landlord, index) => {
           return (
-            <Fragment key={crypto.randomUUID()}>
+            <Fragment key={`${index}_${landlord.nationalId}`}>
               <GridRow className={gridRow}>
                 <GridColumn span={['12/12']}>
                   <KeyValue
@@ -77,9 +77,9 @@ export const ApplicantsSummary = ({ answers }: Props) => {
             : formatMessage(summary.tenantsHeader)
         }
       >
-        {tenantListWithoutRepresentatives.map((tenant) => {
+        {tenantListWithoutRepresentatives.map((tenant, index) => {
           return (
-            <Fragment key={crypto.randomUUID()}>
+            <Fragment key={`${index}_${tenant.nationalId}`}>
               <GridRow className={gridRow}>
                 <GridColumn span={['12/12']}>
                   <KeyValue
diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/LandlordInfoSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/LandlordInfoSummary.tsx
index d7c66f90d991..d1c2732fc990 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/LandlordInfoSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/LandlordInfoSummary.tsx
@@ -44,7 +44,10 @@ export const LandlordInfoSummary = ({ answers }: Props) => {
                 />
               </GridColumn>
               <GridColumn span={['12/12', '6/12']}>
-                <KeyValue label={summary.emailLabel} value={landlord.email} />
+                <KeyValue
+                  label={summary.emailLabel}
+                  value={landlord.email || '-'}
+                />
               </GridColumn>
               <GridColumn span={['12/12', '6/12']}>
                 <KeyValue
diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/PropertyInfoSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/PropertyInfoSummary.tsx
index 9123cc849fe7..4f93bd14977e 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/PropertyInfoSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/PropertyInfoSummary.tsx
@@ -1,10 +1,14 @@
 import { GridColumn, GridRow } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
 import { RentalAgreement } from '../../lib/dataSchema'
-import { RentalHousingConditionInspector } from '../../lib/constants'
 import {
-  getPropertyCategoryClassOptions,
-  getPropertyCategoryTypeOptions,
+  RentalHousingCategoryClass,
+  RentalHousingConditionInspector,
+} from '../../lib/constants'
+import {
+  getPropertyTypeOptions,
+  getPropertyClassOptions,
+  getPropertyClassGroupOptions,
 } from '../../lib/utils'
 import { summary } from '../../lib/messages'
 import { KeyValue } from './KeyValue'
@@ -20,13 +24,19 @@ export const PropertyInfoSummary = ({ answers }: Props) => {
   const { formatMessage } = useLocale()
 
   const propertyType = (answer: string) => {
-    const options = getPropertyCategoryTypeOptions()
+    const options = getPropertyTypeOptions()
+    const matchingOption = options.find((option) => option.value === answer)
+    return matchingOption ? matchingOption.label : '-'
+  }
+
+  const propertyClass = (answer: string) => {
+    const options = getPropertyClassOptions()
     const matchingOption = options.find((option) => option.value === answer)
     return matchingOption ? matchingOption.label : '-'
   }
 
-  const propertyCategory = (answer: string) => {
-    const options = getPropertyCategoryClassOptions()
+  const propertyClassGroup = (answer: string) => {
+    const options = getPropertyClassGroupOptions()
     const matchingOption = options.find((option) => option.value === answer)
     return matchingOption ? matchingOption.label : '-'
   }
@@ -60,16 +70,29 @@ export const PropertyInfoSummary = ({ answers }: Props) => {
       <Divider />
 
       <GridRow className={gridRow}>
-        <GridColumn span={['12/12']}>
+        <GridColumn span={['12/12', '4/12']}>
           <KeyValue
-            label={summary.propertyCategoryLabel}
+            label={summary.propertyClassLabel}
             value={
-              propertyCategory(
-                answers.registerProperty.categoryClass as string,
-              ) || '-'
+              propertyClass(answers.registerProperty.categoryClass as string) ||
+              '-'
             }
           />
         </GridColumn>
+        {answers.registerProperty.categoryClass ===
+          RentalHousingCategoryClass.SPECIAL_GROUPS &&
+          answers.registerProperty.categoryClassGroup && (
+            <GridColumn span={['12/12', '4/12']}>
+              <KeyValue
+                label={summary.propertyClassGroupLabel}
+                value={
+                  propertyClassGroup(
+                    answers.registerProperty.categoryClassGroup as string,
+                  ) || '-'
+                }
+              />
+            </GridColumn>
+          )}
       </GridRow>
 
       <Divider />
diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/RentalInfoSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/RentalInfoSummary.tsx
index dddb2ce63b04..3c4949672a14 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/RentalInfoSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/RentalInfoSummary.tsx
@@ -179,23 +179,6 @@ export const RentalInfoSummary = ({ answers }: Props) => {
             </>
           )}
       </GridRow>
-
-      {/* <Divider />
-
-        <GridRow className={gridRow}>
-          <GridColumn span={['12/12', '4/12']}>
-            <KeyValue
-              label={summary.paymentTransactionTypeLabel}
-              value={'---'}
-            />
-          </GridColumn>
-          <GridColumn span={['12/12', '4/12']}>
-            <KeyValue
-              label={summary.paymentTransactionAccountLabel}
-              value={'---'}
-            />
-          </GridColumn>
-        </GridRow> */}
     </SummarySection>
   )
 }
diff --git a/libs/application/templates/rental-agreement/src/fields/Summary/TenantInfoSummary.tsx b/libs/application/templates/rental-agreement/src/fields/Summary/TenantInfoSummary.tsx
index a8cd6bbc15bf..ba81b0df136a 100644
--- a/libs/application/templates/rental-agreement/src/fields/Summary/TenantInfoSummary.tsx
+++ b/libs/application/templates/rental-agreement/src/fields/Summary/TenantInfoSummary.tsx
@@ -44,7 +44,10 @@ export const TenantInfoSummary = ({ answers }: Props) => {
                 />
               </GridColumn>
               <GridColumn span={['12/12', '6/12']}>
-                <KeyValue label={summary.emailLabel} value={tenant.email} />
+                <KeyValue
+                  label={summary.emailLabel}
+                  value={tenant.email || '-'}
+                />
               </GridColumn>
               <GridColumn span={['12/12', '6/12']}>
                 <KeyValue
diff --git a/libs/application/templates/rental-agreement/src/forms/rentalHousingInfo/rentalHousingPropertyInfo.ts b/libs/application/templates/rental-agreement/src/forms/rentalHousingInfo/rentalHousingPropertyInfo.ts
index 4093927a73c8..191827524cbe 100644
--- a/libs/application/templates/rental-agreement/src/forms/rentalHousingInfo/rentalHousingPropertyInfo.ts
+++ b/libs/application/templates/rental-agreement/src/forms/rentalHousingInfo/rentalHousingPropertyInfo.ts
@@ -16,9 +16,9 @@ import {
 } from '../../lib/constants'
 import {
   getApplicationAnswers,
-  getPropertyCategoryClassGroupOptions,
-  getPropertyCategoryClassOptions,
-  getPropertyCategoryTypeOptions,
+  getPropertyTypeOptions,
+  getPropertyClassOptions,
+  getPropertyClassGroupOptions,
 } from '../../lib/utils'
 import { registerProperty } from '../../lib/messages'
 
@@ -127,13 +127,13 @@ export const RentalHousingPropertyInfo: SubSection = buildSubSection({
             )
             return [
               [
-                propertyId ? `F${propertyId}` : '-',
+                propertyId ? `F${propertyId}` : '--',
                 address
                   ? `${address}${municipality ? `, ${municipality}` : ''}`
-                  : '-',
-                unitId ? unitId : '-',
-                size ? `${size} m²` : '-',
-                numOfRooms ? numOfRooms : '-',
+                  : '--',
+                unitId ? unitId : '--',
+                size ? `${size} m²` : '--',
+                numOfRooms ? numOfRooms : '--',
               ],
             ]
           },
@@ -154,7 +154,7 @@ export const RentalHousingPropertyInfo: SubSection = buildSubSection({
           id: 'registerProperty.categoryType',
           title: messagesCategory.typeTitle,
           description: messagesCategory.typeDescription,
-          options: getPropertyCategoryTypeOptions(),
+          options: getPropertyTypeOptions(),
           defaultValue: RentalHousingCategoryTypes.ENTIRE_HOME,
           required: true,
         }),
@@ -162,7 +162,7 @@ export const RentalHousingPropertyInfo: SubSection = buildSubSection({
           id: 'registerProperty.categoryClass',
           title: messagesCategory.classTitle,
           description: messagesCategory.classDescription,
-          options: getPropertyCategoryClassOptions(),
+          options: getPropertyClassOptions(),
           defaultValue: RentalHousingCategoryClass.GENERAL_MARKET,
           required: true,
           width: 'half',
@@ -173,14 +173,12 @@ export const RentalHousingPropertyInfo: SubSection = buildSubSection({
           title: messagesCategory.classGroupLabel,
           placeholder: messagesCategory.classGroupPlaceholder,
           condition: (answers) => {
-            const { propertyCategoryClassOptions } =
-              getApplicationAnswers(answers)
+            const { propertyClassOptions } = getApplicationAnswers(answers)
             return (
-              propertyCategoryClassOptions ===
-              RentalHousingCategoryClass.SPECIAL_GROUPS
+              propertyClassOptions === RentalHousingCategoryClass.SPECIAL_GROUPS
             )
           },
-          options: getPropertyCategoryClassGroupOptions(),
+          options: getPropertyClassGroupOptions(),
         }),
       ],
     }),
diff --git a/libs/application/templates/rental-agreement/src/forms/rentalPeriod/rentalPeriodDetails.ts b/libs/application/templates/rental-agreement/src/forms/rentalPeriod/rentalPeriodDetails.ts
index 67aa65e8fe03..268007f7b5e5 100644
--- a/libs/application/templates/rental-agreement/src/forms/rentalPeriod/rentalPeriodDetails.ts
+++ b/libs/application/templates/rental-agreement/src/forms/rentalPeriod/rentalPeriodDetails.ts
@@ -19,8 +19,6 @@ const rentalPeriodIsDefinite = (answers: FormValue) => {
   return rentalPeriodDefinite && rentalPeriodDefinite.includes(TRUE)
 }
 
-console.log('RentalPeriodIsDefinite: ', rentalPeriodIsDefinite)
-
 export const RentalPeriodDetails = buildSubSection({
   id: 'rentalPeriod',
   title: rentalPeriod.subSectionName,
diff --git a/libs/application/templates/rental-agreement/src/lib/messages/summary.ts b/libs/application/templates/rental-agreement/src/lib/messages/summary.ts
index bf6879e0f67e..030bbc2e85d1 100644
--- a/libs/application/templates/rental-agreement/src/lib/messages/summary.ts
+++ b/libs/application/templates/rental-agreement/src/lib/messages/summary.ts
@@ -166,10 +166,15 @@ export const summary = defineMessages({
     defaultMessage: 'Fermetrar',
     description: 'Property size label',
   },
-  propertyCategoryLabel: {
-    id: 'ra.application:summary.propertyCategoryLabel',
+  propertyClassLabel: {
+    id: 'ra.application:summary.propertyClassLabel',
     defaultMessage: 'Flokkun húsnæðis',
-    description: 'Property category label',
+    description: 'Property classification label',
+  },
+  propertyClassGroupLabel: {
+    id: 'ra.application:summary.propertyClassGroupLabel',
+    defaultMessage: 'Hópur',
+    description: 'Property classification group label',
   },
   propertyDescriptionLabel: {
     id: 'ra.application:summary.propertyDescriptionLabel',
diff --git a/libs/application/templates/rental-agreement/src/lib/utils.ts b/libs/application/templates/rental-agreement/src/lib/utils.ts
index b4fd8414f5e5..88fee7347e1a 100644
--- a/libs/application/templates/rental-agreement/src/lib/utils.ts
+++ b/libs/application/templates/rental-agreement/src/lib/utils.ts
@@ -32,17 +32,15 @@ export const formatCurrency = (answer: string) =>
   answer.replace(/\B(?=(\d{3})+(?!\d))/g, '.') + ' ISK'
 
 export const getApplicationAnswers = (answers: Application['answers']) => {
-  const propertyCategoryTypeOptions =
-    getValueViaPath<RentalHousingCategoryTypes>(
-      answers,
-      'registerProperty.categoryType',
-    )
+  const propertyTypeOptions = getValueViaPath<RentalHousingCategoryTypes>(
+    answers,
+    'registerProperty.categoryType',
+  )
 
-  const propertyCategoryClassOptions =
-    getValueViaPath<RentalHousingCategoryClass>(
-      answers,
-      'registerProperty.categoryClass',
-    )
+  const propertyClassOptions = getValueViaPath<RentalHousingCategoryClass>(
+    answers,
+    'registerProperty.categoryClass',
+  )
 
   const inspectorOptions = getValueViaPath<RentalHousingConditionInspector>(
     answers,
@@ -77,8 +75,8 @@ export const getApplicationAnswers = (answers: Application['answers']) => {
   )
 
   return {
-    propertyCategoryTypeOptions,
-    propertyCategoryClassOptions,
+    propertyTypeOptions,
+    propertyClassOptions,
     inspectorOptions,
     rentalAmountIndexTypesOptions,
     rentalAmountPaymentDateOptions,
@@ -88,7 +86,7 @@ export const getApplicationAnswers = (answers: Application['answers']) => {
   }
 }
 
-export const getPropertyCategoryTypeOptions = () => [
+export const getPropertyTypeOptions = () => [
   {
     value: RentalHousingCategoryTypes.ENTIRE_HOME,
     label: m.registerProperty.category.typeSelectLabelEntireHome,
@@ -103,7 +101,7 @@ export const getPropertyCategoryTypeOptions = () => [
   },
 ]
 
-export const getPropertyCategoryClassOptions = () => [
+export const getPropertyClassOptions = () => [
   {
     value: RentalHousingCategoryClass.GENERAL_MARKET,
     label: m.registerProperty.category.classSelectLabelGeneralMarket,
@@ -114,7 +112,7 @@ export const getPropertyCategoryClassOptions = () => [
   },
 ]
 
-export const getPropertyCategoryClassGroupOptions = () => [
+export const getPropertyClassGroupOptions = () => [
   {
     value: RentalHousingCategoryClassGroup.STUDENT_HOUSING,
     label: m.registerProperty.category.classGroupSelectLabelStudentHousing,