diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index 6307898f..e4985bee 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -153,8 +153,9 @@ open class InputField: EntryFieldBase {
             var state = super.state
             if showSuccess {
                 state.insert(.success)
-                
-            } else if textField.isFirstResponder {
+            }
+            
+            if textField.isFirstResponder {
                 state.insert(.focused)
             }
             
@@ -207,6 +208,7 @@ open class InputField: EntryFieldBase {
         successLabel.textColorConfiguration = primaryColorConfiguration.eraseToAnyColorable()
         
         backgroundColorConfiguration.setSurfaceColors(VDSColor.feedbackSuccessBackgroundOnlight, VDSColor.feedbackSuccessBackgroundOndark, forState: .success)
+        
         borderColorConfiguration.setSurfaceColors(VDSColor.feedbackSuccessOnlight, VDSColor.feedbackSuccessOndark, forState: .success)
 
     }
@@ -332,6 +334,7 @@ open class InputField: EntryFieldBase {
 extension InputField: UITextFieldDelegate {
     public func textFieldDidBeginEditing(_ textField: UITextField) {
         fieldType.handler().textFieldDidBeginEditing(self, textField: textField)
+        setNeedsUpdate()
     }
     
     public func textFieldDidEndEditing(_ textField: UITextField) {