diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
index 81f08f45..837493e5 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
@@ -215,9 +215,11 @@ import MVMCore
         
         proprietorTextDelegate?.textFieldDidEndEditing?(textField)
         
-        if validateMDNTextField() && isNationalMDN {
-            textField.text = MVMCoreUIUtility.formatMdn(textField.text)
-            self.validateText()
+        if validateMDNTextField() {
+            if isNationalMDN {
+                textField.text = MVMCoreUIUtility.formatMdn(textField.text)
+            }
+            validateText()
         }
     }