diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17ea7f59e..8945d146d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))
 - Updated PostComponent, fix missing like button on comments ([132c1dce](https://github.com/pixelfed/pixelfed/commit/132c1dce))
 - Updated PostComponent.vue, fix load more comments button ([847599ad](https://github.com/pixelfed/pixelfed/commit/847599ad))
+- Updated 2FA Checkpoint, add username + logout button and numeric inputmode ([26affb11](https://github.com/pixelfed/pixelfed/commit/26affb11))
 
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
diff --git a/resources/views/auth/checkpoint.blade.php b/resources/views/auth/checkpoint.blade.php
index d7f1ed306..7f949aca1 100644
--- a/resources/views/auth/checkpoint.blade.php
+++ b/resources/views/auth/checkpoint.blade.php
@@ -6,7 +6,10 @@
         <div class="col-lg-5">
             <div class="text-center">
                 <img src="/img/pixelfed-icon-color.svg" height="60px">
-                <p class="font-weight-light h3 py-4">Verify 2FA Code to continue</p>
+                <p class="font-weight-light h3 py-4">Verify Two Factor Code</p>
+            </div>
+            <div class="alert alert-info small">
+                If you lose access to your 2FA device, contact the admins.
             </div>
             <div class="card">
                 <div class="card-body">
@@ -16,7 +19,7 @@
                         <div class="form-group row">
 
                             <div class="col-md-12">
-                                <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" placeholder="{{__('Two-Factor Authentication Code')}}" required autocomplete="off" autofocus="">
+                                <input id="code" type="text" class="form-control{{ $errors->has('code') ? ' is-invalid' : '' }}" name="code" placeholder="{{__('Two-Factor Authentication Code')}}" required autocomplete="off" autofocus="" inputmode="numeric" minlength="6" maxlength="6">
 
                                 @if ($errors->has('code'))
                                     <span class="invalid-feedback">
@@ -37,6 +40,15 @@
                     </form>
                 </div>
             </div>
+            <div class="d-flex justify-content-between pt-4 small">
+                <a class="text-lighter text-decoration-none" href="/{{Auth::user()->username}}">Logged in as: <span class="font-weight-bold text-muted">{{Auth::user()->username}}</span></a>
+                <span>
+                    <a class="text-decoration-none text-muted font-weight-bold" href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">Logout</a>
+                    <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                        @csrf
+                    </form>
+                </span>
+            </div>
         </div>
     </div>
 </div>