diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 81308c64..7231c51c 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -114,6 +114,20 @@ $(document).ready(function() {
   }
 });
 
+$(".session").click(function() {
+    window.sessionStorage.setItem("back", window.location.pathname);
+});
+
+$("#back").click(function() {
+   var loc = sessionStorage.getItem("back");
+   if (!loc) {
+       loc = $(this).data("back");
+   }
+   sessionStorage.removeItem("back");
+   window.location.href = loc;
+
+});
+
 function confirmDialog(id, dialogid, dataValue, yesFn, noFn) {
     var $confirm = $("#" + dialogid);
     $confirm.modal('show');
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 7c4b04a7..d5a070c9 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -600,7 +600,7 @@ function responseHandler(res) {
 }
 
 function singleUserFormatter(value, row) {
-    return '<a class="btn btn-default" href="' + window.location.pathname + '/../../admin/user/' + row.id + '">' + this.buttontext + '</a>'
+    return '<a class="btn btn-default" onclick="storeLocation()" href="' + window.location.pathname + '/../../admin/user/' + row.id + '">' + this.buttontext + '</a>'
 }
 
 function checkboxFormatter(value, row, index){
@@ -741,6 +741,6 @@ function queryParams(params)
     return params;
 }
 
-function test(){
-    console.log("hello");
+function storeLocation() {
+    window.sessionStorage.setItem("back", window.location.pathname);
 }
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 5226151e..c06b7e72 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -26,7 +26,7 @@
         {% for user in allUser %}
           {% if not user.role_anonymous() or config.config_anonbrowse %}
           <tr>
-            <td><a href="{{url_for('admin.edit_user', user_id=user.id)}}">{{user.name}}</a></td>
+            <td><a class="session" href="{{url_for('admin.edit_user', user_id=user.id)}}">{{user.name}}</a></td>
             <td>{{user.email}}</td>
             <td>{{user.kindle_mail}}</td>
             <td>{{user.downloads.count()}}</td>
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index ac1c36d2..59978ea9 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -66,7 +66,7 @@
    {% if feature_support['gmail'] %}
     </div>
    {% endif %}
-      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Back')}}</a>
   </form>
     {% if g.allow_registration %}
   <div class="col-md-10 col-lg-6">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index e2b184fc..846ad978 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -129,7 +129,7 @@
       <div class="col-sm-12">
     <div id="user_submit" class="btn btn-default">{{_('Save')}}</div>
     {% if not profile %}
-      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
+      <div class="btn btn-default" data-back="{{ url_for('admin.admin') }}" id="back">{{_('Cancel')}}</div>
     {% endif %}
     {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
       <div class="btn btn-danger" id="btndeluser" data-value="{{ content.id }}" data-remote="false" >{{_('Delete User')}}</div>
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
index b8a9d2c2..c538dfa4 100644
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -137,6 +137,9 @@
         </tr>
       </thead>
     </table>
+    <div class="errorlink">
+      <div class="btn btn-default" data-back="{{ url_for('admin.admin') }}" id="back">{{_('Back')}}</div>
+    </div>
 {% endblock %}
 {% block modal %}
 {{ delete_confirm_modal() }}