diff --git a/CTFd/themes/core-beta/templates/components/navbar.html b/CTFd/themes/core-beta/templates/components/navbar.html
index abf806cc4d1fb2a57f9d25c9c263290bf0df837d..d8f1e6cdf0ad6e2d8861e02deff95dc647b47a08 100644
--- a/CTFd/themes/core-beta/templates/components/navbar.html
+++ b/CTFd/themes/core-beta/templates/components/navbar.html
@@ -30,14 +30,6 @@
 
     <div class="collapse navbar-collapse" id="base-navbars">
       <ul class="navbar-nav me-auto">
-        {% for page in Plugins.user_menu_pages %}
-          <li class="nav-item">
-            <a class="nav-link" href="{{ page.route }}" {% if page.link_target %}target="{{ page.link_target }}"{% endif %}>
-              {{ page.title }}
-            </a>
-          </li>
-          
-        {% endfor %}
         <li class="nav-item">
           <a class="nav-link" href="/scoreboard">
             Classement
@@ -48,6 +40,14 @@
             {% trans %}Défis{% endtrans %}
           </a>
         </li>
+        {% for page in Plugins.user_menu_pages %}
+        <li class="nav-item">
+          <a class="nav-link" href="{{ page.route }}" {% if page.link_target %}target="{{ page.link_target }}"{% endif %}>
+            {{ page.title }}
+          </a>
+        </li>
+        
+        {% endfor %}
         {% if Configs.account_visibility != 'public' %}
           <li class="nav-item">
             <a class="nav-link" href="{{ url_for('users.listing') }}">
diff --git a/CTFd/views.py b/CTFd/views.py
index c921a2ed2126d1b53da9712e852d7a8fd010ba05..a311c032a2508da568fa5977133bb24be55592fa 100644
--- a/CTFd/views.py
+++ b/CTFd/views.py
@@ -402,7 +402,7 @@ def settings():
     )
 
 
-@views.route("/", defaults={"route": "index"})
+@views.route("/", defaults={"route": "none"})
 @views.route("/<path:route>")
 def static_html(route):
     """
@@ -412,7 +412,7 @@ def static_html(route):
     """
     page = get_page(route)
     if page is None:
-        return redirect(url_for("scoreboard.listing", next=request.full_path))
+        return redirect(url_for("scoreboard.listing"))
     else:
         if page.auth_required and authed() is False:
             return redirect(url_for("auth.login", next=request.full_path))