diff --git a/src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html b/src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html
index 15784d5..8b00680 100644
--- a/src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html
@@ -3,7 +3,7 @@
{% block title %} {% trans 'Unconfirmed Hanchans from' %} {{player.username}} {% endblock %}
-{% block teaser %}
diff --git a/src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html b/src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html
index 5e37ab4..3ed4f47 100644
--- a/src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html
@@ -3,7 +3,7 @@
{% block title %} {% trans 'Kyu Score for' %} {{membership.username}} {% endblock %}
-{% block teaser %}
diff --git a/src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html b/src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html
index 9605ab3..e13af5e 100644
--- a/src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block title %} {% trans 'Ladder Score for' %} {{membership.username}} / {{ season }}{% endblock %}
-{% block teaser %}
diff --git a/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html b/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
index 1a11751..91a559f 100644
--- a/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
@@ -3,7 +3,7 @@
{% block teaser %}
-
- {% trans 'Start' %}: {{ season_start|date:'SHORT_DATE_FORMAT' }}
diff --git a/src/maistar_ranking/templates/maistar_ranking/player_game_list.html b/src/maistar_ranking/templates/maistar_ranking/player_game_list.html
index d9d7baf..6b9e3ba 100644
--- a/src/maistar_ranking/templates/maistar_ranking/player_game_list.html
+++ b/src/maistar_ranking/templates/maistar_ranking/player_game_list.html
@@ -3,7 +3,7 @@
{% block title %} {% trans 'Ladder Score for' %} {{membership.username}} {% endblock %}
-{% block teaser %} {% trans 'Mai-Star Games' %}: {{membership.username}}
{% trans 'Season' %} {{season}}
{% endblock %}
+{% block teaser %} {% trans 'Mai-Star Games' %}: {{membership.username}}
{% trans 'Season' %} {{season}}
{% endblock %}
{% block score_list %}
diff --git a/src/maistar_ranking/templates/maistar_ranking/ranking_list.html b/src/maistar_ranking/templates/maistar_ranking/ranking_list.html
index 2e367f3..4107649 100644
--- a/src/maistar_ranking/templates/maistar_ranking/ranking_list.html
+++ b/src/maistar_ranking/templates/maistar_ranking/ranking_list.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load i18n comments humanize %}
-{% block teaser %}
{% trans 'Mai-Star Ranking' %} - {% trans 'Season' %} {{season}}
{% endblock %}
+{% block teaser %}
{% trans 'Mai-Star Ranking' %} - {% trans 'Season' %} {{season}}
{% endblock %}
{% block maincontent %}
diff --git a/src/membership/templates/registration/login.html b/src/membership/templates/registration/login.html
new file mode 100644
index 0000000..101a832
--- /dev/null
+++ b/src/membership/templates/registration/login.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+
+{% load url from future %}
+{% load i18n %}
+
+{% block title %}{% trans 'login' %}{% endblock %}
+
+{% block teaser %}{% trans 'login' %}
{% endblock %}
+
+{% block maincontent %}
+
+{% endblock %}
+
diff --git a/src/membership/templates/registration/password_change_done.html b/src/membership/templates/registration/password_change_done.html
new file mode 100644
index 0000000..8854a4f
--- /dev/null
+++ b/src/membership/templates/registration/password_change_done.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password change successful' %}{% endblock %}
+
+{% block content %}
+{% trans 'Password change successful' %}
+{% trans 'Your password was changed.' %}
+{% endblock %}
diff --git a/src/membership/templates/registration/password_change_form.html b/src/membership/templates/registration/password_change_form.html
new file mode 100644
index 0000000..f5f9c98
--- /dev/null
+++ b/src/membership/templates/registration/password_change_form.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password change' %}{% endblock %}
+
+
+{% block callout %}
+
+
{% trans 'Password change' %}
+
{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}
+
+{% endblock %}
+
+{% block content %}
+
+
+{% endblock %}
+
diff --git a/src/membership/templates/registration/password_reset_complete.html b/src/membership/templates/registration/password_reset_complete.html
new file mode 100644
index 0000000..3036435
--- /dev/null
+++ b/src/membership/templates/registration/password_reset_complete.html
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset complete' %}{% endblock %}
+
+{% block teaser %}{% trans 'Password reset complete' %}
{% endblock %}
+
+{% block content %}
+{% trans 'Password reset complete' %}
+{% trans "Your password has been set. You may go ahead and log in now." %}
+
+
+ {% trans 'Login' %}
+
+
+{% endblock %}
+
diff --git a/src/membership/templates/registration/password_reset_confirm.html b/src/membership/templates/registration/password_reset_confirm.html
new file mode 100644
index 0000000..286fb0d
--- /dev/null
+++ b/src/membership/templates/registration/password_reset_confirm.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Enter new password' %}{% endblock %}
+
+{% block teaser %}{% trans 'Enter new password' %}
{% endblock %}
+
+{% block maincontent %}
+{% if validlink %}
+
+
+
+
+{% else %}
+
{% trans 'Password reset unsuccessful' %}
+
{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}
+{% endif %}
+
+{% endblock %}
+
diff --git a/src/membership/templates/registration/password_reset_done.html b/src/membership/templates/registration/password_reset_done.html
new file mode 100644
index 0000000..211dde0
--- /dev/null
+++ b/src/membership/templates/registration/password_reset_done.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans 'Password reset successful' %}{% endblock %}
+
+{% block teaser %}
{% trans 'Password reset successful' %}
{% endblock %}
+
+
+{% block maincontent %}
+
+
+
{% trans 'Password reset successful' %}
+
Wir haben dir eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwort an die angegebene E-Mail-Adresse geschickt.
+Du solltest diese in Kürze erhalten.
+
+
+
E-Mail nicht angekommen?
+
+
Etwas Warten...
+
Einige Anti-Spam Techniken verzögern den Empfang von E-Mails.
+ Bei solchen Postfächern kann der Empfang einzelner Mails bis zu 30 Minuten dauern.
+
+
+
+
Junk Mails prüfen
+
Bitte überprüfe den "Junk" bzw. "SPAM" Ordner deines Postfaches.
+ Automatisch generierte E-Mails werden leider sehr oft falsch von SPAM-Filtern geschluckt
+
+
+
Vorbei schauen
+
Bitte Überprüfe die Richigkeit deiner angegebenen E-Mail Adresse. Wenn deine angegebne E-Mail Adresse nicht mehr aktuell ist, trete mit uns bitte in persönlichen Kontakt
+
+{% endblock %}
+
diff --git a/src/membership/templates/registration/password_reset_form.html b/src/membership/templates/registration/password_reset_form.html
new file mode 100644
index 0000000..ac900ee
--- /dev/null
+++ b/src/membership/templates/registration/password_reset_form.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Password reset" %}{% endblock %}
+
+{% block teaser %}
{% trans "Password reset" %}
{% endblock %}
+
+{% block maincontent %}
+
+
+
Du hast dein Passwort vergessen?
+
Macht nichts!
+Solange die E-Mail Adresse von dir noch gültig ist, kannst du dein Passwort jederzeit wieder ändern.
+
+
+
+
+
Einfach deine E-Mail-Adresse eingeben und wir senden dir die Anweisungen zum Zurücksetzen deines Passworts.
+
+{% endblock %}
+