diff --git a/ogcp/templates/base.html b/ogcp/templates/base.html
index 39680c3..8906fd9 100644
--- a/ogcp/templates/base.html
+++ b/ogcp/templates/base.html
@@ -33,10 +33,10 @@
                     <li class="nav-item {% block nav_images%}{% endblock %}">
                         <a class="nav-link" href="{{ url_for('images') }}">{{ _('Images') }}</a>
                     </li>
-                    {% if current_user.admin %}
                     <li class="nav-item {% block nav_scopes%}{% endblock %}">
                         <a class="nav-link" href="{{ url_for('scopes') }}">{{ _('Scopes management') }}</a>
                     </li>
+                    {% if current_user.admin %}
                     <li class="nav-item {% block nav_repos %}{% endblock %}">
                         <a class="nav-link" href="{{ url_for('manage_repos') }}">{{ _('Repos') }}</a>
                     </li>
diff --git a/ogcp/templates/scopes.html b/ogcp/templates/scopes.html
index 9b93971..8a0701f 100644
--- a/ogcp/templates/scopes.html
+++ b/ogcp/templates/scopes.html
@@ -16,6 +16,7 @@
 {% endblock %}
 
 {% block commands %}
+  {% if current_user.is_authenticated %}
   <div class="dropdown btn">
     <button class="btn btn-secondary btn-light dropdown-toggle {% block nav_client %}{% endblock %}" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
         {{ _('Client') }}
@@ -31,6 +32,8 @@
              form="scopesForm" formaction="{{ url_for('action_client_delete') }}" formmethod="get">
     </div>
   </div>
+  {% endif %}
+  {% if current_user.admin %}
   <div class="dropdown btn">
     <button class="btn btn-secondary btn-light dropdown-toggle {% block nav_room %}{% endblock %}" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
         {{ _('Room') }}
@@ -53,6 +56,7 @@
              form="scopesForm" formaction="{{ url_for('action_center_delete') }}" formmethod="get">
     </div>
   </div>
+  {% endif %}
   {% if btn_back %}
     <button class="btn btn-danger ml-3" type="button" id="backButton" onclick="history.back()">
       {{ _("Back") }}