diff --git a/CHANGELOG b/CHANGELOG
index d20399e26106733cb83bd822086c3dd94252c863..5cf57c51d0ac3839ee917ea7035deafef31d0238 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+smasch (1.0.0~beta.5-1) unstable; urgency=low
+
+  * bug fix: login page did not contain valid link to help with account
+    (#368)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 04 Feb 2021 12:00:00 +0200
+
 smasch (1.0.0~beta.4-1) unstable; urgency=low
 
   * bug fix: MEDIA_ROOT was overwritten by tests that messed up with
diff --git a/smash/smash/context_processors.py b/smash/smash/context_processors.py
index f60066ac7aa617647182e6569a8833219eec31be..2d0918cb1d86044f22edb518e6f934c80b1b0af2 100644
--- a/smash/smash/context_processors.py
+++ b/smash/smash/context_processors.py
@@ -1,5 +1,5 @@
 from web.models import ConfigurationItem
-from web.models.constants import LOGIN_PAGE_BACKGROUND_IMAGE
+from web.models.constants import LOGIN_PAGE_BACKGROUND_IMAGE, DEFAULT_FROM_EMAIL
 
 
 # noinspection PyUnusedLocal
@@ -8,5 +8,6 @@ def login_background(request):
     Context processor - these values will be available to templates once registered in settings.py
     """
     return {
-        'login_page_background': ConfigurationItem.objects.get(type=LOGIN_PAGE_BACKGROUND_IMAGE).value
+        'login_page_background': ConfigurationItem.objects.get(type=LOGIN_PAGE_BACKGROUND_IMAGE).value,
+        'email': ConfigurationItem.objects.get(type=DEFAULT_FROM_EMAIL).value
     }
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index c7a7abef0592673cfc8d744107f41b475b9c93c9..04b403df30e08fd520a240b2270f737f781ed387 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -256,7 +256,7 @@ desired effect
         {% block footer %}
             <!-- To the right -->
             <div class="pull-right hidden-xs">
-                Version: <strong>1.0.0~beta.4</strong>
+                Version: <strong>1.0.0~beta.5</strong>
             </div>
 
             <!-- Default to the left -->
diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html
index b3d6f45aed805d7665719838eb203308ffd75305..6ef7a47fd82e46c38bb7b89f90d5507728c2e701 100644
--- a/smash/web/templates/login.html
+++ b/smash/web/templates/login.html
@@ -105,8 +105,7 @@
 
         <hr/>
 
-        <a href="#">I forgot my password</a><br>
-        <a href="#">I have an issue with account</a>
+        <a href="mailto:{{ email }}?subject=Problem with smasch account">I have an issue with account</a>
 
     </div>
     <!-- /.login-box-body -->