diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
index fe2c483c..db3c28c4 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
@@ -147,6 +147,16 @@ import MVMCore
         MVMCoreNavigationHandler.shared()?.present(picker, animated: true)
     }
     
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    
+    public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        
+        textField.keyboardType = .phonePad
+    }
+    
     //--------------------------------------------------
     // MARK: - Contact Picker Delegate
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index 785c986d..76b70b80 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -352,7 +352,6 @@ import UIKit
             
         default:
             textField.keyboardType = .default
-            break
         }
         
         // Override the preset keyboard set in type.