diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
index b06f00ac..81f08f45 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
@@ -134,7 +134,6 @@ import MVMCore
             UIAccessibility.post(notification: .layoutChanged, argument: textField)
         }
         
-        self.validateText()
         return isValid
     }
     
@@ -218,6 +217,7 @@ import MVMCore
         
         if validateMDNTextField() && isNationalMDN {
             textField.text = MVMCoreUIUtility.formatMdn(textField.text)
+            self.validateText()
         }
     }