diff --git a/app/components/login/login.css b/app/components/login/login.css
index e92872c..1e867fa 100644
--- a/app/components/login/login.css
+++ b/app/components/login/login.css
@@ -45,7 +45,6 @@ html, body {
   font-size: 15px;
   font-weight: 100;
   text-transform: uppercase;
-  margin-top: 20px;
   height: 35px;
   width: 225px;
   background-color: #2196F3;
diff --git a/app/components/login/login.html b/app/components/login/login.html
index 099261e..6508c54 100644
--- a/app/components/login/login.html
+++ b/app/components/login/login.html
@@ -9,7 +9,7 @@
 <form class="login-form" id="login-form">
   <div>
     <label for="username-input">Username</label>
-    <input type="text" id="username-input"/>
+    <input type="text" id="username-input" autofocus/>
   </div>
   <div>
     <label for="password-input">Password</label>