diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index ce2aca7d..ffac7e34 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -104,7 +104,7 @@ open class InputField: EntryField, UITextFieldDelegate {
     }
     
     public var textFieldTextColorConfiguration: AnyColorable = ViewColorConfiguration().with {
-        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: true)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
     }.eraseToAnyColorable()
 
@@ -163,7 +163,7 @@ open class InputField: EntryField, UITextFieldDelegate {
     open override func updateView() {
         super.updateView()
         
-        textField.isEnabled = isEnabled
+        textField.isEnabled = !disabled
         textField.textColor = textFieldTextColorConfiguration.getColor(self)
         
         //show error or success
diff --git a/VDS/Components/TextFields/TextArea/TextArea.swift b/VDS/Components/TextFields/TextArea/TextArea.swift
index c109ea77..31ade50c 100644
--- a/VDS/Components/TextFields/TextArea/TextArea.swift
+++ b/VDS/Components/TextFields/TextArea/TextArea.swift
@@ -54,7 +54,7 @@ open class TextArea: EntryField {
     }
     
     public var textViewTextColorConfiguration: AnyColorable = ViewColorConfiguration().with {
-        $0.setSurfaceColors(VDSColor.elementsSecondaryOnlight, VDSColor.elementsSecondaryOndark, forDisabled: true)
+        $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forDisabled: true)
         $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
     }.eraseToAnyColorable()
     
@@ -95,7 +95,7 @@ open class TextArea: EntryField {
     open override func updateView() {
         super.updateView()
         
-        textView.isEditable = isEnabled
+        textView.isEditable = !disabled
         textView.textColor = textViewTextColorConfiguration.getColor(self)
         
         //set the width constraints