diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b762ac5e..d2e10ca7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -21,7 +21,7 @@ This document describes changes between each past release.
 - Add a new setting to allow public project creation (ALLOW_PUBLIC_PROJECT_CREATION)
 - With admin credentials, one can access every project
 - Add delete and edit project actions in the dashboard
-- Add a new setting to activate the dashboard (ACTIVATE_DASHBOARD)
+- Add a new setting to activate the dashboard (ACTIVATE_ADMIN_DASHBOARD)
 - Add a link to the dashboard in the navigation bar when it is activated
 
 ### Removed
diff --git a/budget/default_settings.py b/budget/default_settings.py
index f05c7798..f17651bc 100644
--- a/budget/default_settings.py
+++ b/budget/default_settings.py
@@ -15,4 +15,4 @@ ADMIN_PASSWORD = "pbkdf2:sha256:50000$jc3isZTD$b3be8d04ed5c2c1ac89d5eb777facc94a
 
 ALLOW_PUBLIC_PROJECT_CREATION = True
 
-ACTIVATE_DASHBOARD = False
+ACTIVATE_ADMIN_DASHBOARD = False
diff --git a/budget/templates/dashboard.html b/budget/templates/dashboard.html
index 35a845b8..231462b3 100644
--- a/budget/templates/dashboard.html
+++ b/budget/templates/dashboard.html
@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block content %}
-{% if is_dashboard_activated %}
+{% if is_admin_dashboard_activated %}
 <table id="bill_table" class="table table-striped">
     <thead><tr><th>{{ _("Project") }}</th><th>{{ _("Number of members") }}</th><th>{{ _("Number of bills") }}</th><th>{{_("Newest bill")}}</th><th>{{_("Oldest bill")}}</th><th>{{_("Actions")}}</th></tr></thead>
     <tbody>{% for project in projects|sort(attribute='name') %}
diff --git a/budget/tests/tests.py b/budget/tests/tests.py
index 11b3a0b7..bb265316 100644
--- a/budget/tests/tests.py
+++ b/budget/tests/tests.py
@@ -613,7 +613,7 @@ class BudgetTestCase(TestCase):
         self.assertIn('<div class="alert alert-danger">', resp.data.decode('utf-8'))
 
         # test access to the dashboard when it is activated
-        run.app.config['ACTIVATE_DASHBOARD'] = True
+        run.app.config['ACTIVATE_ADMIN_DASHBOARD'] = True
         resp = self.app.post("/admin?goto=%2Fdashboard", data={'admin_password': 'adminpass'},
                              follow_redirects=True)
         self.assertIn('<thead><tr><th>Project</th><th>Number of members', resp.data.decode('utf-8'))
diff --git a/budget/web.py b/budget/web.py
index e97857d4..95909158 100644
--- a/budget/web.py
+++ b/budget/web.py
@@ -517,6 +517,6 @@ def settle_bill():
 @main.route("/dashboard")
 @requires_admin()
 def dashboard():
-    is_dashboard_activated = current_app.config['ACTIVATE_DASHBOARD']
+    is_admin_dashboard_activated = current_app.config['ACTIVATE_ADMIN_DASHBOARD']
     return render_template("dashboard.html", projects=Project.query.all(),
-                           is_dashboard_activated=is_dashboard_activated)
+                           is_admin_dashboard_activated=is_admin_dashboard_activated)
diff --git a/docs/installation.rst b/docs/installation.rst
index 7c881cf0..59e658e7 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -93,7 +93,7 @@ properly.
 +------------------------------+---------------------------+----------------------------------------------------------------------------------------+
 | ALLOW_PUBLIC_PROJECT_CREATION|  ``True``                 | If set to `True`, everyone can create a project without entering the admin password    |
 +------------------------------+---------------------------+----------------------------------------------------------------------------------------+
-| ACTIVATE_DASHBOARD           |  ``False``                | If set to `True`, the dashboard will become accessible entering the admin password     |
+| ACTIVATE_ADMIN_DASHBOARD     |  ``False``                | If set to `True`, the dashboard will become accessible entering the admin password     |
 +------------------------------+---------------------------+----------------------------------------------------------------------------------------+
 
 .. _`the SQLAlechemy documentation`: http://docs.sqlalchemy.org/en/latest/core/engines.html#database-urls