diff --git a/app.py b/app.py
index 2964ebc..e321d0d 100644
--- a/app.py
+++ b/app.py
@@ -75,7 +75,9 @@ def create_app():
         WTF_CSRF_SECRET_KEY=os.getenv("CSRF_SECRET_KEY", "csrf_changeme"),
         MATRIX_HOMESERVER=os.getenv("MATRIX_HOMESERVER"),
         MATRIX_SHARED_SECRET=os.getenv("MATRIX_SHARED_SECRET"),
-        REGISTRATION_SUCCESS_REDIRECT=os.getenv("REGISTRATION_SUCCESS_REDIRECT")
+        REGISTRATION_SUCCESS_REDIRECT=os.getenv(
+            "REGISTRATION_SUCCESS_REDIRECT"),
+        RIOT_APP_TARGET=os.getenv("RIOT_APP_TARGET", "https://riot.im/app/")
     ))
 
     log.info("Admin Token: %s" % flask_app.config.get("ADMIN_TOKEN"))
diff --git a/templates/base.html b/templates/base.html
index b511118..cd1ebf1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,6 +7,7 @@
     <div class="pure-menu pure-menu-horizontal">
         <a href="{{ url_for('index') }}" class="pure-menu-heading pure-menu-link">NullOctet Matrix</a>
         <ul class="pure-menu-list">
+            <li class="pure-menu-item"><a href="{{ config.RIOT_APP_TARGET }}" class="pure-menu-link">Riot</a></li>
             {% if g.user %}
                 <li class="pure-menu-item"><a href="{{ url_for('registration') }}" class="pure-menu-link">Register</a>
                 <li class="pure-menu-item"><a href="{{ url_for('admin_index') }}" class="pure-menu-link">Admin Panel</a>