diff --git a/accounts/templates/registration/logged_out.html b/accounts/templates/registration/logged_out.html
deleted file mode 100644
index 89a935c..0000000
--- a/accounts/templates/registration/logged_out.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends 'base.html' %}
-
-{% load bootstrap3 %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-    Logout
-  </h1>
-</div>
-
-<div class="row">
-  <div class="col-md-offset-4 col-md-4">
-    <div class="well">
-      <p>You are not logged in anymore. <a href="{% url 'login' %}">Login again ?</a></p>
-    </div>
-  </div>
-</div>
-
-{% endblock %}
diff --git a/accounts/templates/registration/login.html b/accounts/templates/registration/login.html
index a2b5acc..fdc5adc 100644
--- a/accounts/templates/registration/login.html
+++ b/accounts/templates/registration/login.html
@@ -26,4 +26,10 @@
   </div>
 </div>
 
+<div class="row">
+  <div class="col-md-offset-4 col-md-4">
+    You do not have an account? Please <a href="{% url 'registration_register' %}">register</a>.
+  </div>
+</div>
+
 {% endblock %}
diff --git a/accounts/templates/registration/password_change_form.html b/accounts/templates/registration/password_change_form.html
index 58ba91f..140a98d 100644
--- a/accounts/templates/registration/password_change_form.html
+++ b/accounts/templates/registration/password_change_form.html
@@ -18,7 +18,7 @@
         {% csrf_token %}
         <div class="form-group text-center">
           <button type="submit" class="btn btn-primary">Submit</button>
-          <a href="{% if request.GET.prev %}{{ request.GET.prev }}{% else %}{% url 'home' %}{% endif %}" class="btn btn-default">Cancel</a>
+          <a href="{% if request.GET.prev %}{{ request.GET.prev }}{% else %}{% url 'profile' %}{% endif %}" class="btn btn-default">Cancel</a>
         </div>
       </form>
     </div>
diff --git a/accounts/urls.py b/accounts/urls.py
index 5613344..3143204 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import include, url
+from django.contrib.auth import views as auth_views
 
 from .views import profile
 
 urlpatterns = [
     url(r'^profile$', profile, name='profile'),
+    url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='logout'),
     url(r'', include('django.contrib.auth.urls')),
 ]
diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html
index 70b12c2..dc9b584 100644
--- a/ponyconf/templates/base.html
+++ b/ponyconf/templates/base.html
@@ -59,6 +59,7 @@
             <li><a href="{% url 'logout' %}" data-toggle="tooltip" data-placement="bottom" title="Logout"><span class="glyphicon glyphicon-log-out"></span></a></li>
             {% else %}
             <li><a href="{% url 'login' %}?next={{ request.path }}"><span class="glyphicon glyphicon-log-in"></span>&nbsp;Login</a></li>
+            <li><a href="{% url 'registration_register' %}"><span class="glyphicon glyphicon-edit"></span>&nbsp;Register</a></li>
             {% endif %}
           </ul>
           {% block navbar-right %}{% endblock %}