diff --git a/nativeauthenticator/handlers.py b/nativeauthenticator/handlers.py
index 9d5913a..f406236 100644
--- a/nativeauthenticator/handlers.py
+++ b/nativeauthenticator/handlers.py
@@ -141,6 +141,7 @@ def _render(self, login_error=None, username=None):
             login_error=login_error,
             custom_html=self.authenticator.custom_html,
             login_url=self.settings['login_url'],
+            second_factor_auth=self.authenticator.add_two_factor_authentication,
             authenticator_login_url=url_concat(
                 self.authenticator.login_url(self.hub.base_url),
                 {'next': self.get_argument('next', '')},
diff --git a/nativeauthenticator/templates/native-login.html b/nativeauthenticator/templates/native-login.html
index 5994d55..d7cafa8 100644
--- a/nativeauthenticator/templates/native-login.html
+++ b/nativeauthenticator/templates/native-login.html
@@ -32,7 +32,12 @@
             </p>
             {% endif %}
             <label for="username_input">Username:</label>
-            <input id="username_input" type="text" autocapitalize="off" autocorrect="off" class="form-control" name="username" val="{{username}}" tabindex="1" autofocus="autofocus" />
+            <input id="username_input" type="text" autocapitalize="off" autocorrect="off" class="form-control" name="username" val="{{username}}" 
+            tabindex="1" autofocus="autofocus" />
+            {% if second_factor_auth %}
+            <label for="2auth_input">Second auth factor:</label>
+            <input id="2auth_input" type="text" autocapitalize="off" autocorrect="off" class="form-control" name="2auth" tabindex="1" autofocus="autofocus" />
+            {% endif %}
             <label for='password_input'>Password:</label>
             <div class="input-group">
                 <input type="password" class="form-control" name="password" id="password_input" tabindex="2" />