diff --git a/authentication/templates/authentication/change_password.html b/authentication/templates/authentication/auth_form.html
similarity index 70%
rename from authentication/templates/authentication/change_password.html
rename to authentication/templates/authentication/auth_form.html
index 9e128e7..8889833 100644
--- a/authentication/templates/authentication/change_password.html
+++ b/authentication/templates/authentication/auth_form.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 
 {% block content %}
-    <h1>{% block title %}Change password{% endblock %}</h1>
+    <h1>{% block title %}{{ title }}{% endblock %}</h1>
 
     <div id="login">
         <form method="post">
@@ -11,7 +11,7 @@
             {% endif %}
             {% csrf_token %}
             {{ form|crispy }}
-            <button type="submit" class="btn btn-primary">Change password</button>
+            <button type="submit" class="btn btn-primary">{{ action }}</button>
         </form>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/authentication/templates/authentication/login.html b/authentication/templates/authentication/login.html
deleted file mode 100644
index ba2149a..0000000
--- a/authentication/templates/authentication/login.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends 'base.html' %}
-{% load staticfiles %}
-{% load crispy_forms_filters %}
-
-{% block content %}
-    <h1>{% block title %}Login{% endblock %}</h1>
-
-    <div id="login">
-        <form name="LoginForm" action="{% url 'auth_login' %}" method="post">
-            {% if next %}
-                <input type="hidden" name="next" value="{{ next }}"/>
-            {% endif %}
-            {% csrf_token %}
-            {{ form|crispy }}
-            <button type="submit" class="btn btn-primary">Login</button>
-        </form>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/authentication/urls.py b/authentication/urls.py
index 457b9a7..cabd659 100644
--- a/authentication/urls.py
+++ b/authentication/urls.py
@@ -1,18 +1,37 @@
+from authentication.views import password_change_done
 from django.conf.urls import url
 from django.contrib.auth.views import login, logout, password_change
-from authentication.views import password_change_done
 
 urlpatterns = [
-    url(r'^login/$',
+    url(
+        r'^login/$',
         login,
-        {'template_name': 'authentication/login.html'},
+        {
+            'template_name': 'authentication/auth_form.html',
+            'extra_context': {
+                'title': 'Login',
+                'action': 'Login'
+            }
+        },
         name='auth_login'
-        ),
-    url(r'^logout/$',
+    ),
+    url(
+        r'^logout/$',
         logout,
         {'next_page': 'home'},
         name='auth_logout'
-        ),
-    url(r'^password/change/$', password_change, {'template_name': 'authentication/change_password.html'}, name='password_change'),
+    ),
+    url(
+        r'^password/change/$',
+        password_change,
+        {
+            'template_name': 'authentication/auth_form.html',
+            'extra_context': {
+                'title': 'Change password',
+                'action': 'Change password'
+            }
+        },
+        name='password_change'
+    ),
     url(r'^password/change/done/$', password_change_done, name='password_change_done'),
 ]