diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index e81ea2fa6..ed96b48c2 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -55,8 +55,13 @@ a:visited {
     color: $accent-color;
 }
 
+input[type=text] {
+    background-color: $primary-bg-color;
+    color: $primary-fg-color;
+}
+
 input[type=text].error, input[type=password].error {
-    border: 1px solid red;
+    border: 1px solid $warning-color;
 }
 
 input[type=text]:focus, textarea:focus {
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 0fb25a6a7..b9fd2d12b 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -7,6 +7,9 @@ $primary-bg-color: #ffffff;
 // used for dialog box text
 $light-fg-color: #747474;
 
+// used for focusing form controls
+$focus-bg-color: #dddddd;
+
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
 $accent-color: #76CFA6;
diff --git a/src/skins/vector/css/themes/dark.scss b/src/skins/vector/css/themes/dark.scss
index e56024026..5449b90ed 100644
--- a/src/skins/vector/css/themes/dark.scss
+++ b/src/skins/vector/css/themes/dark.scss
@@ -4,6 +4,9 @@
 $primary-fg-color: #dddddd;
 $primary-bg-color: #2d2d2d;
 
+// used for focusing form controls
+$focus-bg-color: #101010;
+
 // used for dialog box text
 $light-fg-color: #747474;
 
diff --git a/src/skins/vector/css/vector-web/views/directory/_NetworkDropdown.scss b/src/skins/vector/css/vector-web/views/directory/_NetworkDropdown.scss
index 9147fdb7c..84aa896a9 100644
--- a/src/skins/vector/css/vector-web/views/directory/_NetworkDropdown.scss
+++ b/src/skins/vector/css/vector-web/views/directory/_NetworkDropdown.scss
@@ -68,11 +68,11 @@ input.mx_NetworkDropdown_networkoption, input.mx_NetworkDropdown_networkoption:f
     padding: 0px;
     border-radius: 3px;
     border: 1px solid $accent-color;
-    background-color: white;
+    background-color: $primary-bg-color;
 }
 
 .mx_NetworkDropdown_menu .mx_NetworkDropdown_networkoption:hover {
-    background-color: #ddd;
+    background-color: $focus-bg-color;
 }
 
 .mx_NetworkDropdown_menu_network {