diff --git a/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.css.ts b/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.css.ts
index ea3742b5dbf5..98d6743a4d78 100644
--- a/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.css.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.css.ts
@@ -1,5 +1,6 @@
 import { style } from '@vanilla-extract/css'
-import { themeUtils } from '@island.is/island-ui/theme'
+
+import { theme, themeUtils } from '@island.is/island-ui/theme'
 
 export const container = style({
   background: 'linear-gradient(180deg, #E6F2FB 21.56%, #90D9E3 239.74%)',
@@ -42,3 +43,7 @@ export const bsiLogo = style({
 export const bsiLogoMobile = style({
   height: '40px',
 })
+
+export const marginLeft = style({
+  marginLeft: theme.spacing[2],
+})
diff --git a/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.tsx b/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.tsx
index 325e012bfe8c..7284c5134592 100644
--- a/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.tsx
+++ b/apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaFooter.tsx
@@ -2,20 +2,19 @@ import { ReactNode } from 'react'
 import cn from 'classnames'
 import { BLOCKS } from '@contentful/rich-text-types'
 
+import { SliceType } from '@island.is/island-ui/contentful'
 import {
-  Box,
   GridColumn,
   GridContainer,
   GridRow,
   Hyphen,
   Text,
 } from '@island.is/island-ui/core'
+import { theme } from '@island.is/island-ui/theme'
 import { FooterItem } from '@island.is/web/graphql/schema'
+import { useNamespace } from '@island.is/web/hooks'
 import { useWindowSize } from '@island.is/web/hooks/useViewport'
-import { theme } from '@island.is/island-ui/theme'
-import { SliceType } from '@island.is/island-ui/contentful'
 import { webRichText } from '@island.is/web/utils/richText'
-import { useNamespace } from '@island.is/web/hooks'
 
 import * as styles from './FiskistofaFooter.css'
 
@@ -35,11 +34,11 @@ const FiskistofaFooter = ({
 
   return (
     <footer>
-      <Box className={styles.container}>
+      <div className={styles.container}>
         <GridContainer className={styles.mainColumn}>
           <GridColumn>
             <GridRow>
-              <Box marginLeft={2}>
+              <div className={styles.marginLeft}>
                 <img
                   src={n(
                     'fiskistofaFooterLogo',
@@ -47,7 +46,7 @@ const FiskistofaFooter = ({
                   )}
                   alt="fiskistofa-logo"
                 />
-              </Box>
+              </div>
             </GridRow>
             <GridRow marginTop={2} className={styles.linkRow}>
               {footerItems.slice(0, 3).map((item, idx) => (
@@ -91,7 +90,7 @@ const FiskistofaFooter = ({
                       ),
                     },
                   })}
-                  <Box className={styles.iconContainer}>
+                  <div className={styles.iconContainer}>
                     <img
                       src={n(
                         'fiskistofaGraenSkrefLogo',
@@ -121,13 +120,13 @@ const FiskistofaFooter = ({
                         [styles.bsiLogoMobile]: isMobile,
                       })}
                     />
-                  </Box>
+                  </div>
                 </GridColumn>
               )}
             </GridRow>
           </GridColumn>
         </GridContainer>
-      </Box>
+      </div>
     </footer>
   )
 }
diff --git a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunAusturlandsTheme/index.ts b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunAusturlandsTheme/index.ts
index 39d5ff8aa39d..9e6db4df4390 100644
--- a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunAusturlandsTheme/index.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunAusturlandsTheme/index.ts
@@ -4,7 +4,7 @@ import Header from './HeilbrigdisstofnunAusturlandsHeader'
 
 export const HeilbrigdisstofnunAusturlandsFooter = dynamic(
   () => import('./HeilbrigdisstofnunAusturlandsFooter'),
-  { ssr: true },
+  { ssr: false },
 )
 
 export const HeilbrigdisstofnunAusturlandsHeader = Header
diff --git a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunNordurlandsTheme/index.ts b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunNordurlandsTheme/index.ts
index 1621d69ff0d6..137c470ad542 100644
--- a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunNordurlandsTheme/index.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunNordurlandsTheme/index.ts
@@ -6,5 +6,5 @@ export const HeilbrigdisstofnunNordurlandsHeader = Header
 
 export const HeilbrigdisstofnunNordurlandsFooter = dynamic(
   () => import('./HeilbrigdisstofnunNordurlandsFooter'),
-  { ssr: true },
+  { ssr: false },
 )
diff --git a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunSudurlandsTheme/index.ts b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunSudurlandsTheme/index.ts
index c97ed7f61746..0ff31ce96a3a 100644
--- a/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunSudurlandsTheme/index.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/HeilbrigdisstofnunSudurlandsTheme/index.ts
@@ -6,5 +6,5 @@ export const HeilbrigdisstofnunSudurlandsHeader = Header
 
 export const HeilbrigdisstofnunSudurlandsFooter = dynamic(
   () => import('./HeilbrigdisstofnunSudurlandsFooter'),
-  { ssr: true },
+  { ssr: false },
 )
diff --git a/apps/web/components/Organization/Wrapper/Themes/HveTheme/index.ts b/apps/web/components/Organization/Wrapper/Themes/HveTheme/index.ts
index 7608428a5d1d..050ab07b4147 100644
--- a/apps/web/components/Organization/Wrapper/Themes/HveTheme/index.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/HveTheme/index.ts
@@ -3,4 +3,4 @@ import dynamic from 'next/dynamic'
 import Header from './HveHeader'
 
 export const HveHeader = Header
-export const HveFooter = dynamic(() => import('./HveFooter'), { ssr: true })
+export const HveFooter = dynamic(() => import('./HveFooter'), { ssr: false })
diff --git a/apps/web/components/Organization/Wrapper/Themes/IcelandicNaturalDisasterInsuranceTheme/IcelandicNaturalDisasterInsuranceFooter.tsx b/apps/web/components/Organization/Wrapper/Themes/IcelandicNaturalDisasterInsuranceTheme/IcelandicNaturalDisasterInsuranceFooter.tsx
index 3df6760c7e3b..0c9a24aef3d9 100644
--- a/apps/web/components/Organization/Wrapper/Themes/IcelandicNaturalDisasterInsuranceTheme/IcelandicNaturalDisasterInsuranceFooter.tsx
+++ b/apps/web/components/Organization/Wrapper/Themes/IcelandicNaturalDisasterInsuranceTheme/IcelandicNaturalDisasterInsuranceFooter.tsx
@@ -1,3 +1,5 @@
+import { useEffect, useState } from 'react'
+
 import { SliceType } from '@island.is/island-ui/contentful'
 import {
   Box,
@@ -25,7 +27,11 @@ const IcelandicNaturalDisasterInsuranceFooter = ({
 }: IcelandicNaturalDisasterInsuranceFooterProps) => {
   const n = useNamespace(namespace)
   const { width } = useWindowSize()
-  const shouldWrap = width < theme.breakpoints.xl
+  const [shouldWrap, setShouldWrap] = useState(false)
+
+  useEffect(() => {
+    setShouldWrap(width < theme.breakpoints.xl)
+  }, [width])
 
   return (
     <footer className={styles.footer}>
diff --git a/apps/web/components/Organization/Wrapper/Themes/LandlaeknirTheme/index.ts b/apps/web/components/Organization/Wrapper/Themes/LandlaeknirTheme/index.ts
index 1c564b340d8c..55706ef4083a 100644
--- a/apps/web/components/Organization/Wrapper/Themes/LandlaeknirTheme/index.ts
+++ b/apps/web/components/Organization/Wrapper/Themes/LandlaeknirTheme/index.ts
@@ -3,7 +3,7 @@ import dynamic from 'next/dynamic'
 import Header from './LandlaeknirHeader'
 
 export const LandlaeknirFooter = dynamic(() => import('./LandlaeknirFooter'), {
-  ssr: true,
+  ssr: false,
 })
 
 export const LandlaeknirHeader = Header
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
index 1c8a7f36339f..29a06c63e7ae 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.service.ts
@@ -1,88 +1,88 @@
 import { Inject, Injectable } from '@nestjs/common'
 import { S3 } from 'aws-sdk'
-import format from 'date-fns/format'
 import addDays from 'date-fns/addDays'
+import format from 'date-fns/format'
 import cloneDeep from 'lodash/cloneDeep'
 
-import type { Attachment, Period } from '@island.is/clients/vmst'
-import {
-  ParentalLeaveApi,
-  ApplicationInformationApi,
-} from '@island.is/clients/vmst'
-import type { Logger } from '@island.is/logging'
-import { LOGGER_PROVIDER } from '@island.is/logging'
 import { getValueViaPath } from '@island.is/application/core'
 import {
-  ApplicationConfigurations,
-  Application,
-  ApplicationTypes,
-  YesOrNo,
-} from '@island.is/application/types'
-import {
-  getApplicationAnswers,
-  getAvailableRightsInDays,
-  getAvailablePersonalRightsInDays,
-  YES,
+  ADOPTION,
+  ChildInformation,
+  FileType,
   NO,
-  StartDateOptions,
-  UnEmployedBenefitTypes,
-  PARENTAL_LEAVE,
+  OTHER_NO_CHILDREN_FOUND,
   PARENTAL_GRANT,
   PARENTAL_GRANT_STUDENTS,
-  getMultipleBirthsDays,
+  PARENTAL_LEAVE,
+  PERMANENT_FOSTER_CARE,
+  ParentalRelations,
   SINGLE,
+  StartDateOptions,
+  States,
+  UnEmployedBenefitTypes,
+  YES,
+  calculatePeriodLength,
   getAdditionalSingleParentRightsInDays,
+  getApplicationAnswers,
   getApplicationExternalData,
+  getAvailablePersonalRightsInDays,
+  getAvailableRightsInDays,
+  getMultipleBirthsDays,
   getUnApprovedEmployers,
-  ParentalRelations,
-  ChildInformation,
   isParentWithoutBirthParent,
-  calculatePeriodLength,
-  PERMANENT_FOSTER_CARE,
-  OTHER_NO_CHILDREN_FOUND,
-  States,
-  ADOPTION,
 } from '@island.is/application/templates/parental-leave'
+import {
+  Application,
+  ApplicationConfigurations,
+  ApplicationTypes,
+  YesOrNo,
+} from '@island.is/application/types'
+import type { Attachment, Period } from '@island.is/clients/vmst'
+import {
+  ApplicationInformationApi,
+  ParentalLeaveApi,
+} from '@island.is/clients/vmst'
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
 
-import { SharedTemplateApiService } from '../../shared'
+import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
+import { ConfigService } from '@nestjs/config'
 import {
   BaseTemplateAPIModuleConfig,
   TemplateApiModuleActionProps,
 } from '../../../types'
+import { BaseTemplateApiService } from '../../base-template-api.service'
+import { SharedTemplateApiService } from '../../shared'
+import { getConfigValue } from '../../shared/shared.utils'
+import { ChildrenService } from './children/children.service'
+import {
+  APPLICATION_ATTACHMENT_BUCKET,
+  SIX_MONTHS_IN_SECONDS_EXPIRES,
+  apiConstants,
+  df,
+} from './constants'
 import {
-  generateAssignOtherParentApplicationEmail,
-  generateAssignEmployerApplicationEmail,
-  generateOtherParentRejected,
-  generateEmployerRejected,
   generateApplicationApprovedByEmployerEmail,
   generateApplicationApprovedByEmployerToEmployerEmail,
+  generateAssignEmployerApplicationEmail,
+  generateAssignOtherParentApplicationEmail,
+  generateEmployerRejected,
+  generateOtherParentRejected,
 } from './emailGenerators'
+import {
+  getType,
+  checkIfPhoneNumberIsGSM,
+  getFromDate,
+  getRatio,
+  getRightsCode,
+  transformApplicationToParentalLeaveDTO,
+} from './parental-leave.utils'
 import {
   generateAssignEmployerApplicationSms,
   generateAssignOtherParentApplicationSms,
   generateEmployerRejectedApplicationSms,
   generateOtherParentRejectedApplicationSms,
 } from './smsGenerators'
-import {
-  transformApplicationToParentalLeaveDTO,
-  getRatio,
-  getRightsCode,
-  checkIfPhoneNumberIsGSM,
-  isParamsActionName,
-  checkActionName,
-  getFromDate,
-} from './parental-leave.utils'
-import {
-  APPLICATION_ATTACHMENT_BUCKET,
-  SIX_MONTHS_IN_SECONDS_EXPIRES,
-  apiConstants,
-  df,
-} from './constants'
-import { ConfigService } from '@nestjs/config'
-import { getConfigValue } from '../../shared/shared.utils'
-import { BaseTemplateApiService } from '../../base-template-api.service'
-import { ChildrenService } from './children/children.service'
-import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
 
 interface VMSTError {
   type: string
@@ -1403,7 +1403,6 @@ export class ParentalLeaveService extends BaseTemplateApiService {
       isSelfEmployed,
       isReceivingUnemploymentBenefits,
       applicationType,
-      previousState,
       employerLastSixMonths,
       employers,
     } = getApplicationAnswers(application.answers)
@@ -1416,13 +1415,9 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     // }
     const nationalRegistryId = application.applicant
     const attachments = await this.getAttachments(application)
+    const type = getType(application)
 
     try {
-      const actionNameFromParams =
-        previousState === States.RESIDENCE_GRANT_APPLICATION
-          ? isParamsActionName(params)
-          : undefined
-
       const periods = await this.createPeriodsDTO(
         application,
         nationalRegistryId,
@@ -1433,7 +1428,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
         periods,
         attachments,
         false, // put false in testData as this is not dummy request
-        checkActionName(application, actionNameFromParams),
+        type,
       )
 
       const response =
@@ -1449,8 +1444,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
       }
 
       // If applicant is sending additional documents then don't need to send email
-      const { actionName } = getApplicationAnswers(application.answers)
-      if (actionName === 'document') {
+      if (type === FileType.DOCUMENT) {
         return
       }
 
@@ -1506,10 +1500,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     }
   }
 
-  async validateApplication({
-    application,
-    params = undefined,
-  }: TemplateApiModuleActionProps) {
+  async validateApplication({ application }: TemplateApiModuleActionProps) {
     const nationalRegistryId = application.applicant
     const { previousState } = getApplicationAnswers(application.answers)
     /* This is to avoid calling the api every time the user leaves the residenceGrantApplicationNoBirthDate state or residenceGrantApplication state */
@@ -1519,7 +1510,6 @@ export class ParentalLeaveService extends BaseTemplateApiService {
     }
     const attachments = await this.getAttachments(application)
     try {
-      const actionNameFromParams = isParamsActionName(params)
       const periods = await this.createPeriodsDTO(
         application,
         nationalRegistryId,
@@ -1530,7 +1520,7 @@ export class ParentalLeaveService extends BaseTemplateApiService {
         periods,
         attachments,
         true,
-        checkActionName(application, actionNameFromParams),
+        getType(application),
       )
 
       // call SetParentalLeave API with testData: TRUE as this is a dummy request
diff --git a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.utils.ts b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.utils.ts
index 796f539db58f..411c92cf1a54 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.utils.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/parental-leave/parental-leave.utils.ts
@@ -1,40 +1,40 @@
 import jwt from 'jsonwebtoken'
-import { join } from 'path'
 import get from 'lodash/get'
+import { join } from 'path'
 
 import {
-  ParentalLeave,
-  Period,
-  Union,
-  PensionFund,
-  Attachment,
-  Employer,
-} from '@island.is/clients/vmst'
-import {
-  Application,
-  ApplicationWithAttachments,
-} from '@island.is/application/types'
-import {
-  getSelectedChild,
-  getApplicationAnswers,
-  getSpouse,
-  ParentalRelations,
-  YES,
+  ADOPTION,
   Period as AnswerPeriod,
-  getApplicationExternalData,
-  getOtherParentId,
-  applicantIsMale,
-  PARENTAL_LEAVE,
+  ChildInformation,
+  Languages,
+  NO,
   PARENTAL_GRANT,
   PARENTAL_GRANT_STUDENTS,
-  NO,
-  formatBankInfo,
+  PARENTAL_LEAVE,
   PERMANENT_FOSTER_CARE,
-  ChildInformation,
-  ADOPTION,
-  FileType,
-  Languages,
+  ParentalRelations,
+  YES,
+  applicantIsMale,
+  formatBankInfo,
+  getActionName,
+  getApplicationAnswers,
+  getApplicationExternalData,
+  getOtherParentId,
+  getSelectedChild,
+  getSpouse,
 } from '@island.is/application/templates/parental-leave'
+import {
+  Application,
+  ApplicationWithAttachments,
+} from '@island.is/application/types'
+import {
+  Attachment,
+  Employer,
+  ParentalLeave,
+  PensionFund,
+  Period,
+  Union,
+} from '@island.is/clients/vmst'
 import { isRunningOnEnvironment } from '@island.is/shared/utils'
 
 import { apiConstants } from './constants'
@@ -500,31 +500,16 @@ export const isDateInTheFuture = (date: string) => {
   return false
 }
 
-export const isParamsActionName = (params: any) => {
-  typeof params === 'string' &&
-  (params === 'period' ||
-    params === 'document' ||
-    params === 'documentPeriod' ||
-    params === 'empper' ||
-    params === 'employer')
-    ? (params as FileType)
-    : undefined
-  return params
-}
-
-export const checkActionName = (
-  application: ApplicationWithAttachments,
-  params: FileType | undefined = undefined,
-) => {
+export const getType = (application: ApplicationWithAttachments) => {
   const { actionName } = getApplicationAnswers(application.answers)
-  if (params) {
-    params === 'document' ||
-      params === 'documentPeriod' ||
-      params === 'period' ||
-      params === 'empper' ||
-      params === 'employer'
-    return params
+
+  // Check if we can get the the action name. Used when valiating application
+  const tmpActionName = getActionName(application)
+
+  if (tmpActionName) {
+    return tmpActionName
   }
+
   if (
     actionName === 'document' ||
     actionName === 'documentPeriod' ||
@@ -536,6 +521,7 @@ export const checkActionName = (
   ) {
     return actionName
   }
+
   return undefined
 }
 
diff --git a/libs/application/templates/parental-leave/src/lib/ParentalLeaveTemplate.ts b/libs/application/templates/parental-leave/src/lib/ParentalLeaveTemplate.ts
index 52116bb98fad..c315694c3bf2 100644
--- a/libs/application/templates/parental-leave/src/lib/ParentalLeaveTemplate.ts
+++ b/libs/application/templates/parental-leave/src/lib/ParentalLeaveTemplate.ts
@@ -1,60 +1,53 @@
-import { assign } from 'xstate'
+import cloneDeep from 'lodash/cloneDeep'
 import set from 'lodash/set'
 import unset from 'lodash/unset'
-import cloneDeep from 'lodash/cloneDeep'
+import { assign } from 'xstate'
 
 import {
-  coreMessages,
   EphemeralStateLifeCycle,
-  pruneAfterDays,
   coreHistoryMessages,
+  coreMessages,
+  pruneAfterDays,
 } from '@island.is/application/core'
 import {
-  ApplicationContext,
+  Application,
   ApplicationConfigurations,
+  ApplicationContext,
   ApplicationRole,
   ApplicationStateSchema,
-  ApplicationTypes,
   ApplicationTemplate,
-  Application,
+  ApplicationTypes,
   DefaultEvents,
-  defineTemplateApi,
-  UserProfileApi,
   StateLifeCycle,
+  UserProfileApi,
+  defineTemplateApi,
 } from '@island.is/application/types'
 
 import {
-  YES,
   ApiModuleActions,
-  States,
-  ParentalRelations,
-  NO,
+  Events,
   MANUAL,
-  SPOUSE,
-  TransferRightsOption,
-  SINGLE,
-  FileType,
+  NO,
   NO_MULTIPLE_BIRTHS,
-  UnEmployedBenefitTypes,
-  PLEvents,
-  Roles,
-  Events,
   PARENTAL_GRANT,
   PARENTAL_GRANT_STUDENTS,
   PARENTAL_LEAVE,
+  PLEvents,
+  ParentalRelations,
+  Roles,
+  SINGLE,
+  SPOUSE,
+  States,
+  TransferRightsOption,
+  UnEmployedBenefitTypes,
+  YES,
 } from '../constants'
-import { dataSchema } from './dataSchema'
-import { answerValidators } from './answerValidators'
-import { parentalLeaveFormMessages, statesMessages } from './messages'
-import {
-  allEmployersHaveApproved,
-  findActionName,
-  goToState,
-  hasDateOfBirth,
-  hasEmployer,
-  needsOtherParentApproval,
-} from './parentalLeaveTemplateUtils'
+import { ChildrenApi, GetPersonInformation } from '../dataProviders'
 import {
+  calculatePruneDate,
+  determineNameFromApplicationAnswers,
+  employerApprovalStatePendingAction,
+  getActionName,
   getApplicationAnswers,
   getApplicationExternalData,
   getApprovedEmployers,
@@ -62,14 +55,20 @@ import {
   getMultipleBirthRequestDays,
   getOtherParentId,
   getSelectedChild,
-  determineNameFromApplicationAnswers,
   isParentWithoutBirthParent,
   otherParentApprovalStatePendingAction,
-  employerApprovalStatePendingAction,
-  calculatePruneDate,
   getSpouse,
 } from '../lib/parentalLeaveUtils'
-import { ChildrenApi, GetPersonInformation } from '../dataProviders'
+import { answerValidators } from './answerValidators'
+import { dataSchema } from './dataSchema'
+import { parentalLeaveFormMessages, statesMessages } from './messages'
+import {
+  allEmployersHaveApproved,
+  goToState,
+  hasDateOfBirth,
+  hasEmployer,
+  needsOtherParentApproval,
+} from './parentalLeaveTemplateUtils'
 
 export const birthDayLifeCycle: StateLifeCycle = {
   shouldBeListed: true,
@@ -760,7 +759,7 @@ const ParentalLeaveTemplate: ApplicationTemplate<
         },
       },
       [States.RESIDENCE_GRANT_APPLICATION]: {
-        entry: ['assignToVMST', 'setResidenceGrant'],
+        entry: ['assignToVMST', 'setResidenceGrant', 'setActionName'],
         exit: ['setPreviousState', 'setHasAppliedForReidenceGrant'],
         meta: {
           status: 'inprogress',
@@ -789,9 +788,9 @@ const ParentalLeaveTemplate: ApplicationTemplate<
           onExit: defineTemplateApi({
             action: ApiModuleActions.validateApplication,
             triggerEvent: DefaultEvents.APPROVE,
-            params: FileType.DOCUMENTPERIOD,
             throwOnError: true,
           }),
+
           roles: [
             {
               id: Roles.APPLICANT,
@@ -1198,7 +1197,6 @@ const ParentalLeaveTemplate: ApplicationTemplate<
           'removeNullPeriod',
           'setHasAppliedForReidenceGrant',
           'setNavId',
-          'clearChangedPeriodsNEmployers',
         ],
         exit: [
           'clearTemp',
@@ -1206,6 +1204,7 @@ const ParentalLeaveTemplate: ApplicationTemplate<
           'clearAssignees',
           'setPreviousState',
           'setNavId',
+          'clearChangedPeriodsNEmployers',
         ],
         meta: {
           name: States.VINNUMALASTOFNUN_APPROVE_EDITS,
@@ -1248,14 +1247,12 @@ const ParentalLeaveTemplate: ApplicationTemplate<
             defineTemplateApi({
               triggerEvent: DefaultEvents.APPROVE,
               action: ApiModuleActions.sendApplication,
-              params: FileType.DOCUMENTPERIOD,
               shouldPersistToExternalData: true,
               throwOnError: true,
             }),
             defineTemplateApi({
               triggerEvent: DefaultEvents.SUBMIT,
               action: ApiModuleActions.sendApplication,
-              params: FileType.DOCUMENTPERIOD,
               shouldPersistToExternalData: true,
               throwOnError: true,
             }),
@@ -1964,9 +1961,8 @@ const ParentalLeaveTemplate: ApplicationTemplate<
       setActionName: assign((context) => {
         const { application } = context
         const { answers } = application
-        const actionName = findActionName(context)
+        const actionName = getActionName(application)
         set(answers, 'actionName', actionName)
-
         return context
       }),
       clearChangedPeriodsNEmployers: assign((context) => {
@@ -1975,6 +1971,8 @@ const ParentalLeaveTemplate: ApplicationTemplate<
 
         unset(answers, 'changeEmployer')
         unset(answers, 'changePeriods')
+        unset(answers, 'addPeriods')
+        unset(answers, 'addEmployer')
 
         return context
       }),
diff --git a/libs/application/templates/parental-leave/src/lib/parentalLeaveTemplateUtils.ts b/libs/application/templates/parental-leave/src/lib/parentalLeaveTemplateUtils.ts
index 1a1e8cadc574..cfe39965f44d 100644
--- a/libs/application/templates/parental-leave/src/lib/parentalLeaveTemplateUtils.ts
+++ b/libs/application/templates/parental-leave/src/lib/parentalLeaveTemplateUtils.ts
@@ -1,13 +1,13 @@
 import { ApplicationContext } from '@island.is/application/types'
 
+import { getValueViaPath } from '@island.is/application/core'
 import {
-  YES,
   NO,
-  PARENTAL_LEAVE,
   PARENTAL_GRANT,
   PARENTAL_GRANT_STUDENTS,
+  PARENTAL_LEAVE,
   States,
-  FileType,
+  YES,
 } from '../constants'
 import {
   getApplicationAnswers,
@@ -16,8 +16,6 @@ import {
   residentGrantIsOpenForApplication,
 } from '../lib/parentalLeaveUtils'
 import { EmployerRow } from '../types'
-import { getValueViaPath } from '@island.is/application/core'
-import set from 'lodash/set'
 
 export const allEmployersHaveApproved = (context: ApplicationContext) => {
   const employers = getValueViaPath<EmployerRow[]>(
@@ -74,76 +72,6 @@ export const currentDateStartTime = () => {
   return new Date(date).getTime()
 }
 
-export const findActionName = (context: ApplicationContext) => {
-  const { application } = context
-  const { state } = application
-  const {
-    addEmployer,
-    addPeriods,
-    changeEmployerFile,
-    changeEmployer,
-    changePeriods,
-  } = getApplicationAnswers(application.answers)
-
-  if (
-    state === States.RESIDENCE_GRANT_APPLICATION_NO_BIRTH_DATE ||
-    state === States.RESIDENCE_GRANT_APPLICATION
-  )
-    return 'documentPeriod'
-  if (state === States.ADDITIONAL_DOCUMENTS_REQUIRED) return 'document'
-
-  if (state === States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS) {
-    let tmpChangePeriods = changePeriods
-    let tmpChangeEmployer = changeEmployer
-
-    if (addEmployer === YES && addPeriods === YES) {
-      tmpChangeEmployer = true
-      tmpChangePeriods = true
-
-      // Keep book keeping of what has been selected
-      if (!changeEmployer) {
-        set(application.answers, 'changeEmployer', true)
-      }
-      if (!changePeriods) {
-        set(application.answers, 'changePeriods', true)
-      }
-    }
-
-    if (addEmployer === YES) {
-      tmpChangeEmployer = true
-
-      // Keep book keeping of what has been selected
-      if (!changeEmployer) {
-        set(application.answers, 'changeEmployer', true)
-      }
-    }
-    if (addPeriods === YES) {
-      tmpChangePeriods = true
-
-      // Keep book keeping of what has been selected
-      if (!changePeriods) {
-        set(application.answers, 'changePeriods', true)
-      }
-    }
-
-    // If the applicant has selected add employee and/or period at some point
-    if (changeEmployerFile && tmpChangeEmployer && tmpChangePeriods) {
-      return FileType.EMPDOCPER
-    } else if (changeEmployerFile && tmpChangeEmployer) {
-      return FileType.EMPDOC
-    }
-    if (tmpChangeEmployer && tmpChangePeriods) {
-      return FileType.EMPPER
-    } else if (tmpChangeEmployer) {
-      return FileType.EMPLOYER
-    } else if (tmpChangePeriods) {
-      return FileType.PERIOD
-    }
-  }
-
-  return undefined
-}
-
 export const disableResidenceGrantApplication = (dateOfBirth: string) => {
   if (!residentGrantIsOpenForApplication(dateOfBirth)) return false
   return true
diff --git a/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.spec.ts b/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.spec.ts
index a671e2b668ff..85e7884dcb64 100644
--- a/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.spec.ts
+++ b/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.spec.ts
@@ -19,6 +19,8 @@ import {
   SPOUSE,
   ParentalRelations,
   ADOPTION,
+  States,
+  FileType,
 } from '../constants'
 import { ChildInformation } from '../dataProviders/Children/types'
 import {
@@ -53,6 +55,7 @@ import {
   isFosterCareAndAdoption,
   residentGrantIsOpenForApplication,
   setTestBirthAndExpectedDate,
+  getActionName,
 } from './parentalLeaveUtils'
 import { PersonInformation } from '../types'
 
@@ -89,6 +92,23 @@ const buildField = (): Field => {
   }
 }
 
+let id = 0
+const createApplicationBase = (): Application => ({
+  answers: {},
+  applicant: '',
+  assignees: [],
+  attachments: {},
+  created: new Date(),
+  modified: new Date(),
+  applicantActors: [],
+  externalData: {},
+  id: (id++).toString(),
+  state: '',
+  typeId: ApplicationTypes.PARENTAL_LEAVE,
+  name: '',
+  status: ApplicationStatus.IN_PROGRESS,
+})
+
 describe('getExpectedDateOfBirthOrAdoptionDate', () => {
   it('should return undefined when no child is found', () => {
     const application = buildApplication()
@@ -1312,23 +1332,6 @@ describe('getOtherParentId', () => {
 })
 
 describe('getOtherParentName', () => {
-  let id = 0
-  const createApplicationBase = (): Application => ({
-    answers: {},
-    applicant: '',
-    assignees: [],
-    attachments: {},
-    created: new Date(),
-    modified: new Date(),
-    applicantActors: [],
-    externalData: {},
-    id: (id++).toString(),
-    state: '',
-    typeId: ApplicationTypes.PARENTAL_LEAVE,
-    name: '',
-    status: ApplicationStatus.IN_PROGRESS,
-  })
-
   let application: Application
   beforeEach(() => {
     application = createApplicationBase()
@@ -1541,3 +1544,71 @@ test.each([
     expect(residentGrantIsOpenForApplication(date.birthDate)).toBe(expected)
   },
 )
+
+describe.only('getActionName', () => {
+  let application: Application
+  beforeEach(() => {
+    application = createApplicationBase()
+  })
+
+  it('should return FileType.EMPDOCPER if changeEmployerFile, changeEmployer and changePeriods', () => {
+    set(application, 'answers.fileUpload.changeEmployerFile', [
+      { name: 'file1.pdf', key: 'Key1' },
+    ])
+    set(application, 'answers.changeEmployer', true)
+    set(application, 'answers.changePeriods', true)
+
+    application.state = States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS
+
+    const result = getActionName(application)
+
+    expect(result).toBe(FileType.EMPDOCPER)
+  })
+
+  it('should return FileType.PERIOD if changePeriods', () => {
+    set(application, 'answers.changePeriods', true)
+
+    application.state = States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS
+
+    const result = getActionName(application)
+
+    expect(result).toBe(FileType.PERIOD)
+  })
+
+  it('should return FileType.EMPLOYER if changeEmployer', () => {
+    set(application, 'answers.changeEmployer', true)
+
+    application.state = States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS
+
+    const result = getActionName(application)
+
+    expect(result).toBe(FileType.EMPLOYER)
+  })
+
+  it('should return FileType.EMPPER if changePeriods & changeEmployer', () => {
+    set(application, 'answers.changeEmployer', true)
+    set(application, 'answers.changePeriods', true)
+
+    application.state = States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS
+
+    const result = getActionName(application)
+
+    expect(result).toBe(FileType.EMPPER)
+  })
+
+  it('should return FileType.DOCUMENT if state is ADDITIONAL_DOCUMENTS_REQUIRED', () => {
+    application.state = application.state = States.ADDITIONAL_DOCUMENTS_REQUIRED
+
+    const result = getActionName(application)
+
+    expect(result).toBe(FileType.DOCUMENT)
+  })
+
+  it('should return undefined if no conditions met', () => {
+    application.state = application.state = States.CLOSED
+
+    const result = getActionName(application)
+
+    expect(result).toBeUndefined()
+  })
+})
diff --git a/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.ts b/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.ts
index ef3295344e4c..0129a106537a 100644
--- a/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.ts
+++ b/libs/application/templates/parental-leave/src/lib/parentalLeaveUtils.ts
@@ -27,6 +27,7 @@ import parseISO from 'date-fns/parseISO'
 import subDays from 'date-fns/subDays'
 import subMonths from 'date-fns/subMonths'
 import round from 'lodash/round'
+import set from 'lodash/set'
 import { MessageDescriptor } from 'react-intl'
 import {
   additionalSingleParentMonths,
@@ -39,6 +40,7 @@ import {
   ADOPTION,
   AttachmentLabel,
   AttachmentTypes,
+  FileType,
   MANUAL,
   NO,
   OTHER_NO_CHILDREN_FOUND,
@@ -2091,3 +2093,52 @@ export const getSelectOptionLabel = (options: SelectOption[], id?: string) => {
 
   return options.find((option) => option.value === id)?.label
 }
+
+export const getActionName = (
+  application: Application,
+): FileType | undefined => {
+  const { state } = application
+  const {
+    addEmployer,
+    addPeriods,
+    changeEmployer,
+    changePeriods,
+    changeEmployerFile,
+  } = getApplicationAnswers(application.answers)
+
+  switch (state) {
+    case States.RESIDENCE_GRANT_APPLICATION_NO_BIRTH_DATE:
+    case States.RESIDENCE_GRANT_APPLICATION:
+    case States.ADDITIONAL_DOCUMENTS_REQUIRED:
+      return FileType.DOCUMENT
+    case States.EDIT_OR_ADD_EMPLOYERS_AND_PERIODS: {
+      const employerChanged = changeEmployer || addEmployer === YES
+      const periodsChanged = changePeriods || addPeriods === YES
+
+      // Keep book keeping of what has been selected
+      if (!changeEmployer && addEmployer === YES) {
+        set(application.answers, 'changeEmployer', true)
+      }
+      if (!changePeriods && addPeriods === YES) {
+        set(application.answers, 'changePeriods', true)
+      }
+
+      if (changeEmployerFile && changeEmployerFile.length !== 0) {
+        if (employerChanged && periodsChanged) {
+          return FileType.EMPDOCPER
+        } else if (employerChanged) {
+          return FileType.EMPDOC
+        }
+      }
+      if (employerChanged && periodsChanged) {
+        return FileType.EMPPER
+      } else if (employerChanged) {
+        return FileType.EMPLOYER
+      } else if (periodsChanged) {
+        return FileType.PERIOD
+      }
+      break
+    }
+  }
+  return undefined
+}