diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 5e457b4..ed3d233 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -112,6 +112,8 @@ export default class extends AbstractNonAuthenticatedView
 
 		this.titleKey = this.current_mode === 'register' ? 'registerWindowTitle' : 'loginWindowTitle';
 		this.setTitle();
+
+		document.getElementById('username-input').focus();
 	}
 
 	/**