diff --git a/res/css/structures/auth/_Login.scss b/res/css/structures/auth/_Login.scss
index b48021c27a..d4b5e7402c 100644
--- a/res/css/structures/auth/_Login.scss
+++ b/res/css/structures/auth/_Login.scss
@@ -79,7 +79,7 @@ limitations under the License.
 .mx_Login_type_container {
     display: flex;
     margin-bottom: 14px;
-    color: $primary-fg-color;
+    color: $authpage-primary-color;
 }
 
 .mx_Login_type_label {
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index fd54cd135a..6216bdd4b8 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -21,19 +21,41 @@ limitations under the License.
     padding: 25px 60px;
     box-sizing: border-box;
     font-size: 12px;
-    color: $authpage-body-color;
+    color: $authpage-secondary-color;
 }
 
 .mx_AuthBody h2 {
     font-size: 24px;
     font-weight: 600;
     margin-top: 8px;
+    color: $authpage-primary-color;
 }
 
 .mx_AuthBody h3 {
     font-size: 14px;
     font-weight: 600;
-    color: $primary-fg-color;
+    color: $authpage-primary-color;
+}
+
+.mx_AuthBody input[type=text],
+.mx_AuthBody input[type=password] {
+    color: $authpage-primary-color;
+}
+
+.mx_AuthBody .mx_Field input,
+.mx_AuthBody .mx_Field select {
+    color: $authpage-primary-color;
+    background-color: $authpage-body-bg-color;
+}
+
+.mx_AuthBody .mx_Field label {
+    color: $authpage-primary-color;
+}
+
+.mx_AuthBody .mx_Field input:focus + label,
+.mx_AuthBody .mx_Field input:not(:placeholder-shown) + label,
+.mx_AuthBody .mx_Field select + label /* Always show a select's label on top to not collide with the value */ {
+    background-color: $authpage-body-bg-color;
 }
 
 .mx_AuthBody_editServerDetails {
diff --git a/res/css/views/auth/_ServerTypeSelector.scss b/res/css/views/auth/_ServerTypeSelector.scss
index 03f5386501..ed781726b7 100644
--- a/res/css/views/auth/_ServerTypeSelector.scss
+++ b/res/css/views/auth/_ServerTypeSelector.scss
@@ -34,7 +34,7 @@ limitations under the License.
 .mx_ServerTypeSelector_label {
     text-align: center;
     font-weight: 600;
-    color: $primary-fg-color;
+    color: $authpage-primary-color;
     margin: 8px 0;
 }
 
@@ -54,7 +54,7 @@ limitations under the License.
     height: 18px;
     margin-bottom: 12px;
     font-weight: 600;
-    color: $primary-fg-color;
+    color: $authpage-primary-color;
 }
 
 .mx_ServerTypeSelector_logo > div {
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index ac5813ba88..08913cec80 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -246,7 +246,8 @@ $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
 $authpage-body-bg-color: #ffffff;
 $authpage-lang-color: #4e5054;
-$authpage-body-color: #61708b;
+$authpage-primary-color: #454545;
+$authpage-secondary-color: #61708b;
 
 /*** form elements ***/