diff --git a/src/components/GameSidebar.js b/src/components/GameSidebar.js
index 0e955c26ce5743efc4ab22a31ec4a121fa2799bb..0511cdc3e9762a1e027a7f180ff8112289e5d311 100644
--- a/src/components/GameSidebar.js
+++ b/src/components/GameSidebar.js
@@ -23,7 +23,7 @@ export default class GameSidebar extends React.Component {
           </button>
         )}
         {this.state.form === "newgame" && (
-          <NewGameForm view="" toggleView={this.toggleView} />
+          <NewGameForm view="" toggleView={() => this.toggleView("")} />
         )}
       </div>
     );
diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js
index 30aef1e71137cc44963421c66dda70402acfb538..dc993717505f6ce237391bd05d892b2c63117110 100644
--- a/src/components/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -98,6 +98,7 @@ export class LoginForm extends React.Component {
               value={this.state.username}
               onChange={this.handleChange}
               id="loginUsernameInput"
+              autoFocus
             />
             <br />
             <input