diff --git a/controllers/admin.js b/controllers/admin.js
index f180a3897..79f8777db 100644
--- a/controllers/admin.js
+++ b/controllers/admin.js
@@ -428,6 +428,10 @@ exports.adminSessionActiveView = function (aReq, aRes, aNext) {
         : oujsOptions.authFrom
           ? oujsOptions.authFrom
           : null;
+
+      session.showExtend = aReq.sessionID === oujsOptions.sid;
+      session.canExtend = !oujsOptions.extended;
+
       return session;
     });
 
diff --git a/views/includes/session.html b/views/includes/session.html
index 656dfa51d..3b10ba2e3 100644
--- a/views/includes/session.html
+++ b/views/includes/session.html
@@ -42,6 +42,14 @@
             Expires {{#cookie.expires}}<time datetime="{{cookie.expiresISOFormat}}" title="{{cookie.expires}}">{{cookie.expiresHumanized}}</time>{{/cookie.expires}}{{^cookie.expires}}&and;{{/cookie.expires}}.
           </div>
           <div class="pull-right">
+            {{#showExtend}}
+            <form class="form-inline" action="/api/user/session/extend" method="post">
+              <div class="input-group">
+                <button class="btn btn-success" type="submit"{{^canExtend}}disabled="disabled"{{/canExtend}}><i class="fa fa-fw fa-history"></i> Extend</button>
+              </div>
+            </form>
+            {{/showExtend}}
+            {{^showExtend}}
             <form class="form-inline" action="/api/user/session/destroyOne" method="post">
               <div class="input-group">
                 <input type="hidden" name="username" value="{{name}}">
@@ -51,6 +59,7 @@
                 </button>
               </div>
             </form>
+            {{/showExtend}}
           </div>
         </div>
       </div>