diff --git a/client/src/components/login.jsx b/client/src/components/login.jsx
index 0fcbf18f..2c9db016 100644
--- a/client/src/components/login.jsx
+++ b/client/src/components/login.jsx
@@ -70,6 +70,11 @@ class Login extends Component {
         const registerConfirm = () =>
             this.state.register.password === this.state.register.confirm;
 
+        const loginDisabled = () => {
+            const { password, name } = this.state.login;
+            return !(password && name);
+        }
+
         const registerDisabled = () => {
             const { password, name, code } = this.state.register;
             return !(registerConfirm() && password && name && code);
@@ -79,7 +84,7 @@ class Login extends Component {
             <main>
                 <h1>mnml.gg</h1>
                 <div class="login">
-                    <div>mnml is an abstract turn based strategy game.</div>
+                    <div>mnml is an abstract turn based strategy game</div>
                     <div>free to play</div>
                     <div>no email required</div>
                 </div>
@@ -106,6 +111,7 @@ class Login extends Component {
                     <button
                         class="login-btn"
                         tabIndex={4}
+                        disabled={loginDisabled()}
                         onClick={this.loginSubmit}>
                         Login
                     </button>