diff --git a/issue/templates/base.html b/issue/templates/base.html
index 31bedf5..32b4de9 100644
--- a/issue/templates/base.html
+++ b/issue/templates/base.html
@@ -77,7 +77,7 @@
                 </ul>
               </li>
               {% else %}
-              <li><a href="{% url 'login' %}"><span class="glyphicon glyphicon-log-in"></span>&nbsp;Login</a></li>
+              <li><a href="{% url 'login' %}?prev={{ request.get_full_path }}"><span class="glyphicon glyphicon-log-in"></span>&nbsp;Login</a></li>
               {% endif %}
             </ul>
           </div><!--/.nav-collapse -->
diff --git a/issue/templates/login.html b/issue/templates/login.html
index 85d95f8..52b040b 100644
--- a/issue/templates/login.html
+++ b/issue/templates/login.html
@@ -10,7 +10,7 @@
     <h1>
       Login
       <div class="pull-right">
-        <a href="{% url 'list-project' %}"><button class="btn btn-warning">Cancel</button></a>
+        <a href="{% if request.GET.prev %}{{ request.GET.prev }}{% else %}{% url 'list-project' %}{% endif %}"><button class="btn btn-warning">Cancel</button></a>
       </div>
     </h1>
   </div>