diff --git a/templates/error.html b/templates/error.html
new file mode 100644
index 0000000..420b9b0
--- /dev/null
+++ b/templates/error.html
@@ -0,0 +1,22 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load static %}
+{% load bootstrap4 %}
+
+{% block title %}Libravatar: {% trans 'Error!' %}{% endblock title %}
+
+{% block content %}
+<h1 class="error">{% trans 'Error!' %}</h1>
+
+<p>{% block errormessage %}{% trans 'Libravatar has encountered an error.' %}{% endblock errormessage %}</p>
+
+<div style="height:40px"></div>
+
+{% endblock content %}
+
+{% block backlink %}
+{% if user.is_authenticated %}
+<p><a href="{% url 'profile' %}">{% trans 'Back to your profile' %}</a></p>
+{% endif %}
+
+{% endblock %}
diff --git a/templates/openid/failure.html b/templates/openid/failure.html
new file mode 100644
index 0000000..07ad5cf
--- /dev/null
+++ b/templates/openid/failure.html
@@ -0,0 +1,6 @@
+{% extends 'error.html' %}
+{% load i18n %}
+
+{% block errormessage %}
+{% trans 'OpenID error:' %} {{ message }}
+{% endblock errormessage %}
diff --git a/templates/openid/login.html b/templates/openid/login.html
index 91c78ce..919bbc8 100644
--- a/templates/openid/login.html
+++ b/templates/openid/login.html
@@ -28,7 +28,7 @@
 <input class="required openid" id="id_openid_identifier" size="70" maxlength="255" name="openid_identifier" value="{{ openid_identifier }}" type="text"></p>
 
 <p><input type="submit" value="{% trans 'Login' %}" />
-<input type="hidden" name="next" value="{{ next }}" />
+<input type="hidden" name="next" value="{{ request.build_absolute_uri }}" />
 &nbsp;<a href="{% url 'home' %}">{% trans 'Cancel' %}</a></p>
 
 </form>