diff --git a/public/assets/index.css b/public/assets/index.css
index 2e02393..01cd208 100644
--- a/public/assets/index.css
+++ b/public/assets/index.css
@@ -1,8 +1,24 @@
+
+@font-face {
+    src: url("../fonts/Geist/Geist-Medium.woff2") format("woff2");
+    font-family: "Geist";
+    font-weight: normal;
+}
+
+@font-face {
+    src: url("../fonts/Geist/Geist-Bold.woff2") format("woff2");
+    font-family: "Geist";
+    font-weight: bold;
+}
+
 html, body {
     height: 100%;
     width: 100%;
 
     margin: 0;
+
+    font-family: "Geist";
+    font-weight: normal;
 }
 
 #main {
diff --git a/src/ui/components/login.scss b/src/ui/components/login.scss
index 1ceed48..45cd1db 100644
--- a/src/ui/components/login.scss
+++ b/src/ui/components/login.scss
@@ -90,6 +90,10 @@
             }
         }
 
+        input {
+            font-family: inherit;
+        }
+
         &__homeserver {
             grid-area: homeserver;
         }