diff --git a/Components/Input.qml b/Components/Input.qml
index b7b01a2..12d75ef 100644
--- a/Components/Input.qml
+++ b/Components/Input.qml
@@ -245,7 +245,7 @@ Column {
                     }
                     PropertyChanges {
                         target: username
-                        color: root.palette.highlight
+                        color: root.palette.highlightedText
                     }
                 }
             ]
@@ -367,7 +367,7 @@ Column {
                 }
                 PropertyChanges {
                     target: password
-                    color: root.palette.highlight
+                    color: root.palette.highlightedText
                 }
             }
         ]
@@ -506,4 +506,4 @@ Column {
         onTriggered: failed = false
         running: false
     }
-}
\ No newline at end of file
+}
diff --git a/Main.qml b/Main.qml
index 55fde60..4b34315 100644
--- a/Main.qml
+++ b/Main.qml
@@ -21,6 +21,7 @@ Pane {
     padding: config.ScreenPadding
     palette.button: "transparent"
     palette.highlight: config.AccentColor
+    palette.highlightedText: config.OverrideTextFieldColor !== "" ? config.OverrideTextFieldColor : root.palette.highlight
     palette.text: config.MainColor
     palette.buttonText: config.MainColor
     palette.window: config.BackgroundColor
diff --git a/theme.conf b/theme.conf
index ed88782..1f9e86f 100644
--- a/theme.conf
+++ b/theme.conf
@@ -47,6 +47,9 @@ MainColor="#F8F8F2"
 AccentColor="#343746"
 ## Used for elements in focus/hover/pressed. Should be contrasting to the background and the MainColor to achieve the best effect.
 
+OverrideTextFieldColor=""
+## The text color of the username & password when focused/pressed may become difficult to read depending on your color choices. Use this option to set it independently for legibility.
+
 BackgroundColor="#21222C"
 ## Used for the user and session selection background as well as for ScreenPadding and FormBackground when either is true. If PartialBlur and FormBackground are both enabled this color will blend with the blur effect.