diff --git a/src/components/PartnerBonusFormSteps.tsx b/src/components/PartnerBonusFormSteps.tsx
index d38018df..aa4bca10 100644
--- a/src/components/PartnerBonusFormSteps.tsx
+++ b/src/components/PartnerBonusFormSteps.tsx
@@ -3,7 +3,7 @@ import { BooleanRadio, Checkbox, Input } from './FormComponents'
 import { formatRodneCislo } from '../lib/utils'
 import { PartnerBonusFormProps } from './PartnerBonusForm'
 import { Details } from './Details'
-import { TAX_YEAR } from '../lib/calculation'
+import { RODNE_CISLO_DLZKA, TAX_YEAR } from '../lib/calculation'
 
 export const ApplyForBonusQuestion = ({ disabled }) => (
   <>
@@ -167,11 +167,12 @@ export const EligiblePartnerForm = ({
       label="Rodné číslo"
       maxLength={13}
       onChange={async (event) => {
-        const pscValue = formatRodneCislo(
+        const rodneCislo = formatRodneCislo(
           event.currentTarget.value,
           values.r031_rodne_cislo,
         )
-        setFieldValue('r031_rodne_cislo', pscValue)
+        const shouldValidate = RODNE_CISLO_DLZKA <= rodneCislo.length
+        setFieldValue('r031_rodne_cislo', rodneCislo, shouldValidate)
       }}
     />
 
diff --git a/src/components/UrokyBonusFormSteps.tsx b/src/components/UrokyBonusFormSteps.tsx
index db2bfb0e..bffa24c1 100644
--- a/src/components/UrokyBonusFormSteps.tsx
+++ b/src/components/UrokyBonusFormSteps.tsx
@@ -1,15 +1,14 @@
 import React from 'react'
-import { BooleanRadio, Checkbox, Input } from './FormComponents'
-import { formatCurrency, formatRodneCislo } from '../lib/utils'
-import { PartnerBonusFormProps } from './PartnerBonusForm'
+import { BooleanRadio, Input } from './FormComponents'
+import { formatCurrency } from '../lib/utils'
 import { Details } from './Details'
-import { TAX_YEAR } from '../lib/calculation'
 import Fieldset from './fieldset/Fieldset'
 import RadioGroup from './radio/RadioGroup'
 import Radio from './radio/Radio'
 import RadioConditional from './radio/RadioConditional'
 import Decimal from 'decimal.js'
 import { Warning } from './Warning'
+import { TAX_YEAR } from '../lib/calculation'
 
 export const ApplyForBonusQuestion = ({ disabled }) => (
   <>
@@ -196,46 +195,6 @@ export const PrijemQuestion = ({ disabled, values: { uroky_dalsi_dlznik, uroky_r
   )
 }
 
-export const ConditionsQuestion = ({ disabled }) => (
-  <div className="govuk-form-group">
-    <legend className="govuk-fieldset__legend govuk-fieldset__legend--l">
-      <h1 className="govuk-fieldset__heading">
-        Spĺňa vaša manželka / manžel aspoň jednu z podmienok?
-      </h1>
-    </legend>
-    <Checkbox
-      name="partner_podmienky.1"
-      label="Staral/a sa o dieťa do 3 rokov"
-      disabled={disabled}
-    />
-    <Checkbox
-      name="partner_podmienky.2"
-      label="Staral/a sa o dieťa do  6 rokov s nepriaznivým zdravotným stavom"
-      disabled={disabled}
-    />
-    <Checkbox
-      name="partner_podmienky.3"
-      label="Poberá príspevok na opatrovanie ťažko zdravotne postihnutého"
-      disabled={disabled}
-    />
-    <Checkbox
-      name="partner_podmienky.4"
-      label="Poberal/a príspevok na opatrovanie ťažko zdravotne postihnutého"
-      disabled={disabled}
-    />
-    <Checkbox
-      name="partner_podmienky.5"
-      label="Bol/a evidovaný/á ako uchádzač o zamestnanie"
-      disabled={disabled}
-    />
-    <Checkbox
-      name="partner_podmienky.6"
-      label="Považuje sa za občana so zdravotným postihnutím alebo s ťažkým zdravotným postihnutím"
-      disabled={disabled}
-    />
-  </div>
-)
-
 export const NotEligible = () => (
   <div data-test="ineligible-message">
     <h1 className="govuk-heading-l govuk-!-margin-top-3">
@@ -245,44 +204,6 @@ export const NotEligible = () => (
   </div>
 )
 
-export const EligiblePartnerForm = ({
-  values,
-  setFieldValue,
-}: PartnerBonusFormProps) => (
-  <>
-    <h1 className="govuk-heading-l govuk-!-margin-top-3">
-      Vybrané údaje o manželke / manželovi
-    </h1>
-    <Input
-      name="r031_priezvisko_a_meno"
-      type="text"
-      label="Meno a priezvisko manželky / manžela"
-    />
-    <Input
-      name="r031_rodne_cislo"
-      type="text"
-      label="Rodné číslo"
-      maxLength={13}
-      onChange={async (event) => {
-        const pscValue = formatRodneCislo(
-          event.currentTarget.value,
-          values.r031_rodne_cislo,
-        )
-        setFieldValue('r031_rodne_cislo', pscValue)
-      }}
-    />
-
-    <Input
-      name="r032_partner_pocet_mesiacov"
-      type="number"
-      min={1}
-      max={12}
-      label="Počet mesiacov, v ktorých manželka / manžel spĺňal/a podmienky?"
-      hint="Pozor! Ak sú splnené uvedené podmienky iba jeden alebo niekoľko kalendárnych mesiacov v zdaňovacom období, môže si daňovník znížiť základ dane o nezdaniteľnú časť základu dane na manželku zodpovedajúcu 1/12 sumy nezdaniteľnej časti za každý kalendárny mesiac, na začiatku ktorého boli splnené podmienky na uplatnenie tejto nezdaniteľnej časti základu dane."
-    />
-  </>
-)
-
 export const PreviousButton = ({ onClick }) => (
   <button
     className="govuk-button btn-secondary"
diff --git a/src/lib/calculation.ts b/src/lib/calculation.ts
index 352e4b97..5bfe2192 100644
--- a/src/lib/calculation.ts
+++ b/src/lib/calculation.ts
@@ -41,6 +41,8 @@ export const VRCHNA_SADZBA_PRE_PREDDAVKY = new Decimal(16600)
 const POCET_KVARTALOV = 4
 const POCET_MESIACOV = 12
 
+export const RODNE_CISLO_DLZKA = 13
+
 // 63,4-násobok platného životného minima
 const ZVYHODNENIE_NA_PARTNERA = new Decimal(14862.23)
 export const TAX_YEAR = 2023
@@ -1076,3 +1078,4 @@ export const monthKeyValues = (months: string[]): optionWithValue[] => {
 export const donateOnly3Percent = (form: TaxForm): boolean => {
   return form.canDonateTwoPercentOfTax && (form.suma_2_percenta.toNumber() < MIN_2_PERCENT_CALCULATED_DONATION)
 }
+
diff --git a/src/pages/deti.tsx b/src/pages/deti.tsx
index a06d55a7..d4a4fe93 100644
--- a/src/pages/deti.tsx
+++ b/src/pages/deti.tsx
@@ -30,6 +30,7 @@ import {
   calculate,
   CHILD_RATE_EIGHTEEN_AND_OLDER,
   CHILD_RATE_EIGHTEEN_AND_YOUNGER,
+  RODNE_CISLO_DLZKA,
   MAX_CHILD_AGE_BONUS,
   monthKeyValues,
   monthToKeyValue,
@@ -217,13 +218,14 @@ const Deti: Page<ChildrenUserInput> = ({
                               name="r034_rodne_cislo"
                               type="text"
                               label="Rodné číslo"
-                              maxLength={13}
+                              maxLength={RODNE_CISLO_DLZKA}
                               onChange={async (event) => {
                                 const rodneCislo = formatRodneCislo(
                                   event.currentTarget.value,
                                   values.r034_rodne_cislo,
                                 )
-                                setFieldValue('r034_rodne_cislo', rodneCislo)
+                                const shouldValidate = rodneCislo.length >= RODNE_CISLO_DLZKA
+                                setFieldValue('r034_rodne_cislo', rodneCislo, shouldValidate)
                               }}
                             />
 
@@ -318,7 +320,7 @@ const getIncomeHint = (value: string): string => {
 interface ChildFormProps {
   index: number
   savedValues: ChildInput
-  setFieldValue: (name: string, value: string | boolean) => void
+  setFieldValue: (name: string, value: string | boolean, shouldValidate?: boolean) => void
 }
 const ChildForm = ({ savedValues: { rodneCislo, wholeYear }, index, setFieldValue }: ChildFormProps) => {
   const monthNamesFrom = monthNames.filter(month => minChildAgeBonusMonth(rodneCislo, month))
@@ -355,14 +357,15 @@ const ChildForm = ({ savedValues: { rodneCislo, wholeYear }, index, setFieldValu
         name={`children[${index}].rodneCislo` as any}
         type="text"
         label="Rodné číslo"
-        maxLength={13}
+        maxLength={RODNE_CISLO_DLZKA}
         width={10}
         onChange={async (event) => {
           const rodneCisloValue = formatRodneCislo(
             event.currentTarget.value,
             rodneCislo,
           )
-          setFieldValue(`children[${index}].rodneCislo`, rodneCisloValue)
+          const shouldValidate = rodneCisloValue.length >= RODNE_CISLO_DLZKA
+          setFieldValue(`children[${index}].rodneCislo`, rodneCisloValue, shouldValidate)
         }}
       />
       <h3 className="govuk-heading-s">