diff --git a/resources/views/auth/mfa.twig b/resources/views/auth/mfa.twig
index 9297a6d4f3..604e69a182 100644
--- a/resources/views/auth/mfa.twig
+++ b/resources/views/auth/mfa.twig
@@ -1,32 +1,49 @@
-{% extends "./layout/guest" %}
-
+{% extends "./layout/v3/session" %}
 {% block content %}
-    {% if session_has('error') %}
-        <div class="alert alert-danger alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert">
-                <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
-            </button>
-            <strong>{{ 'flash_error'|_ }}</strong> {{ session('error') }}
+    <div class="login-box">
+        <div class="login-logo">
+            <img src="v3-local/logo/logo-session.png" width="68" height="100" alt="Firefly III Logo" title="Firefly III" />
         </div>
-    {% endif %}
 
-    <div class="login-box-body">
-        <p class="login-box-msg">{{ trans('firefly.two_factor_welcome', {user: user.email}) }}</p>
-        <p class="login-box-msg">{{ 'two_factor_enter_code'|_ }}</p>
-
-        <form action="{{ route('two-factor.submit') }}" method="POST">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
-
-            <div class="form-group has-feedback">
-                <input type="text" name="one_time_password" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}" autocomplete="off"/>
+        {% if session_has('error') %}
+            <div class="alert alert-danger alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert">
+                    <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                </button>
+                <strong>{{ 'flash_error'|_ }}</strong> {{ session('error') }}
             </div>
+        {% endif %}
 
-            <div class="row">
-                <div class="col-xs-6 col-xs-offset-6">
-                    <button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'authenticate'|_ }}</button>
-                </div>
+
+        <!-- /.login-logo -->
+        <div class="card">
+            <div class="card-body login-card-body">
+                <p class="login-box-msg">{{ trans('firefly.two_factor_welcome', {user: user.email}) }}</p>
+                <p class="login-box-msg">{{ 'two_factor_enter_code'|_ }}</p>
+
+                <form action="{{ route('two-factor.submit') }}" method="post">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+                    <div class="input-group mb-3">
+                        <input type="text" name="one_time_password" inputmode="numeric" autocomplete="one-time-code" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}" />
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <span class="fas fa-calculator"></span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <!-- /.col -->
+                        <div class="col-6 offset-6">
+                            <button type="submit" class="btn btn-primary btn-block">{{ 'authenticate'|_ }}</button>
+                        </div>
+                        <!-- /.col -->
+                    </div>
+                </form>
+                <p class="mb-1">
+                    <a href="{{ route('two-factor.lost') }}">{{ 'two_factor_forgot'|_ }}</a>
+                </p>
             </div>
-        </form>
-        <a href="{{ route('two-factor.lost') }}">{{ 'two_factor_forgot'|_ }}</a>
+            <!-- /.login-card-body -->
+        </div>
     </div>
 {% endblock %}
diff --git a/resources/views/auth/two-factor.twig b/resources/views/auth/two-factor-removeme.twig
similarity index 97%
rename from resources/views/auth/two-factor.twig
rename to resources/views/auth/two-factor-removeme.twig
index 73fd2998ae..2653d42c40 100644
--- a/resources/views/auth/two-factor.twig
+++ b/resources/views/auth/two-factor-removeme.twig
@@ -1,4 +1,4 @@
-{% extends "./layout/guest" %}
+{% extends "./layout/v3/guest" %}
 
 {% block content %}