diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
index 2e098ad9..36700a9e 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
@@ -345,9 +345,8 @@ import UIKit
         
         numberOfDigits = model.digits
         
-        if let entryType = model.type  {
-            setAsSecureTextEntry(entryType == .secure || entryType == .password)
-        }
+        let entryType = model.type
+        setAsSecureTextEntry(entryType == .secure || entryType == .password)
         
         let observingDelegate = delegateObject?.observingTextFieldDelegate ?? self
         
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
index 910712d5..6181cfdc 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
@@ -144,8 +144,8 @@ import MVMCore
         picker.displayedPropertyKeys = ["phoneNumbers"]
         picker.predicateForEnablingContact = NSPredicate(format: "phoneNumbers.@count > 0")
         picker.predicateForSelectionOfProperty = NSPredicate(format: "key == 'phoneNumbers'")
-        Task(priority: .userInitiated) {
-            await NavigationHandler.shared().present(viewController: picker, animated: true)
+        if let viewContoller = UIApplication.topViewController() {
+            viewContoller.present(picker, animated: true)
         }
     }