diff --git a/swh/web/admin/urls.py b/swh/web/admin/urls.py
index dfbba133..467aeaba 100644
--- a/swh/web/admin/urls.py
+++ b/swh/web/admin/urls.py
@@ -1,22 +1,21 @@
 # Copyright (C) 2018-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 from django.shortcuts import redirect
 from django.urls import re_path as url
 
 from swh.web.admin.adminurls import AdminUrls
-import swh.web.admin.deposit  # noqa
 
 
 def _admin_default_view(request):
     return redirect("admin-origin-save-requests")
 
 
 urlpatterns = [
     url(r"^$", _admin_default_view, name="admin"),
 ]
 
 urlpatterns += AdminUrls.get_url_patterns()
diff --git a/swh/web/common/urlsindex.py b/swh/web/common/urlsindex.py
index 1469f54b..21752418 100644
--- a/swh/web/common/urlsindex.py
+++ b/swh/web/common/urlsindex.py
@@ -1,75 +1,76 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from collections import defaultdict
 from typing import Dict, List
 
 from django.shortcuts import redirect
 from django.urls import URLPattern
 from django.urls import re_path as url
 
 
-class UrlsIndex(object):
+class UrlsIndex:
     """
     Simple helper class for centralizing url patterns of a Django
     web application.
 
     Derived classes should override the 'scope' class attribute otherwise
     all declared patterns will be grouped under the default one.
     """
 
-    _urlpatterns: Dict[str, List[URLPattern]] = {}
+    _urlpatterns: Dict[str, List[URLPattern]] = defaultdict(list)
     scope = "default"
 
     @classmethod
     def add_url_pattern(cls, url_pattern, view, view_name=None):
         """
         Class method that adds an url pattern to the current scope.
 
         Args:
             url_pattern: regex describing a Django url
             view: function implementing the Django view
             view_name: name of the view used to reverse the url
         """
         if cls.scope not in cls._urlpatterns:
             cls._urlpatterns[cls.scope] = []
         if view_name:
             cls._urlpatterns[cls.scope].append(url(url_pattern, view, name=view_name))
         else:
             cls._urlpatterns[cls.scope].append(url(url_pattern, view))
 
     @classmethod
     def add_redirect_for_checksum_args(cls, view_name, url_patterns, checksum_args):
         """
         Class method that redirects to view with lowercase checksums
         when upper/mixed case checksums are passed as url arguments.
 
         Args:
             view_name (str): name of the view to redirect requests
             url_patterns (List[str]): regexps describing the view urls
             checksum_args (List[str]): url argument names corresponding
                                        to checksum values
         """
         new_view_name = view_name + "-uppercase-checksum"
         for url_pattern in url_patterns:
             url_pattern_upper = url_pattern.replace("[0-9a-f]", "[0-9a-fA-F]")
 
             def view_redirect(request, *args, **kwargs):
                 for checksum_arg in checksum_args:
                     checksum_upper = kwargs[checksum_arg]
                     kwargs[checksum_arg] = checksum_upper.lower()
                 return redirect(view_name, *args, **kwargs)
 
             cls.add_url_pattern(url_pattern_upper, view_redirect, new_view_name)
 
     @classmethod
     def get_url_patterns(cls):
         """
         Class method that returns the list of url pattern associated to
         the current scope.
 
         Returns:
             The list of url patterns associated to the current scope
         """
         return cls._urlpatterns[cls.scope]
diff --git a/swh/web/config.py b/swh/web/config.py
index b763dc04..c6b0b135 100644
--- a/swh/web/config.py
+++ b/swh/web/config.py
@@ -1,234 +1,235 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import os
 from typing import Any, Dict
 
 from swh.core import config
 from swh.counters import get_counters
 from swh.indexer.storage import get_indexer_storage
 from swh.scheduler import get_scheduler
 from swh.search import get_search
 from swh.storage import get_storage
 from swh.vault import get_vault
 from swh.web import settings
 
 SWH_WEB_SERVER_NAME = "archive.softwareheritage.org"
 SWH_WEB_INTERNAL_SERVER_NAME = "archive.internal.softwareheritage.org"
 
 SWH_WEB_STAGING_SERVER_NAMES = [
     "webapp.staging.swh.network",
     "webapp.internal.staging.swh.network",
 ]
 
 SETTINGS_DIR = os.path.dirname(settings.__file__)
 
 DEFAULT_CONFIG = {
     "allowed_hosts": ("list", []),
     "storage": (
         "dict",
         {
             "cls": "remote",
             "url": "http://127.0.0.1:5002/",
             "timeout": 10,
         },
     ),
     "indexer_storage": (
         "dict",
         {
             "cls": "remote",
             "url": "http://127.0.0.1:5007/",
             "timeout": 1,
         },
     ),
     "counters": (
         "dict",
         {
             "cls": "remote",
             "url": "http://127.0.0.1:5011/",
             "timeout": 1,
         },
     ),
     "search": (
         "dict",
         {
             "cls": "remote",
             "url": "http://127.0.0.1:5010/",
             "timeout": 10,
         },
     ),
     "search_config": (
         "dict",
         {
             "metadata_backend": "swh-indexer-storage",
         },  # or "swh-search"
     ),
     "log_dir": ("string", "/tmp/swh/log"),
     "debug": ("bool", False),
     "serve_assets": ("bool", False),
     "host": ("string", "127.0.0.1"),
     "port": ("int", 5004),
     "secret_key": ("string", "development key"),
     # do not display code highlighting for content > 1MB
     "content_display_max_size": ("int", 5 * 1024 * 1024),
     "snapshot_content_max_size": ("int", 1000),
     "throttling": (
         "dict",
         {
             "cache_uri": None,  # production: memcached as cache (127.0.0.1:11211)
             # development: in-memory cache so None
             "scopes": {
                 "swh_api": {
                     "limiter_rate": {"default": "120/h"},
                     "exempted_networks": ["127.0.0.0/8"],
                 },
                 "swh_api_origin_search": {
                     "limiter_rate": {"default": "10/m"},
                     "exempted_networks": ["127.0.0.0/8"],
                 },
                 "swh_vault_cooking": {
                     "limiter_rate": {"default": "120/h", "GET": "60/m"},
                     "exempted_networks": ["127.0.0.0/8"],
                 },
                 "swh_save_origin": {
                     "limiter_rate": {"default": "120/h", "POST": "10/h"},
                     "exempted_networks": ["127.0.0.0/8"],
                 },
                 "swh_api_origin_visit_latest": {
                     "limiter_rate": {"default": "700/m"},
                     "exempted_networks": ["127.0.0.0/8"],
                 },
             },
         },
     ),
     "vault": (
         "dict",
         {
             "cls": "remote",
             "args": {
                 "url": "http://127.0.0.1:5005/",
             },
         },
     ),
     "scheduler": ("dict", {"cls": "remote", "url": "http://127.0.0.1:5008/"}),
     "development_db": ("string", os.path.join(SETTINGS_DIR, "db.sqlite3")),
     "test_db": ("dict", {"name": "swh-web-test"}),
     "production_db": ("dict", {"name": "swh-web"}),
     "deposit": (
         "dict",
         {
             "private_api_url": "https://deposit.softwareheritage.org/1/private/",
             "private_api_user": "swhworker",
             "private_api_password": "some-password",
         },
     ),
     "e2e_tests_mode": ("bool", False),
     "es_workers_index_url": ("string", ""),
     "history_counters_url": (
         "string",
         (
             "http://counters1.internal.softwareheritage.org:5011"
             "/counters_history/history.json"
         ),
     ),
     "client_config": ("dict", {}),
     "keycloak": ("dict", {"server_url": "", "realm_name": ""}),
     "graph": (
         "dict",
         {
             "server_url": "http://graph.internal.softwareheritage.org:5009/graph/",
             "max_edges": {"staff": 0, "user": 100000, "anonymous": 1000},
         },
     ),
     "status": (
         "dict",
         {
             "server_url": "https://status.softwareheritage.org/",
             "json_path": "1.0/status/578e5eddcdc0cc7951000520",
         },
     ),
     "counters_backend": ("string", "swh-storage"),  # or "swh-counters"
     "staging_server_names": ("list", SWH_WEB_STAGING_SERVER_NAMES),
     "instance_name": ("str", "archive-test.softwareheritage.org"),
     "give": ("dict", {"public_key": "", "token": ""}),
     "features": ("dict", {"add_forge_now": True}),
     "add_forge_now": ("dict", {"email_address": "add-forge-now@example.com"}),
     "swh_extra_django_apps": (
         "list",
         [
             "swh.web.inbound_email",
             "swh.web.add_forge_now",
             "swh.web.mailmap",
             "swh.web.save_code_now",
+            "swh.web.deposit",
         ],
     ),
 }
 
 swhweb_config: Dict[str, Any] = {}
 
 
 def get_config(config_file="web/web"):
     """Read the configuration file `config_file`.
 
     If an environment variable SWH_CONFIG_FILENAME is defined, this
     takes precedence over the config_file parameter.
 
     In any case, update the app with parameters (secret_key, conf)
     and return the parsed configuration as a dict.
 
     If no configuration file is provided, return a default
     configuration.
 
     """
 
     if not swhweb_config:
         config_filename = os.environ.get("SWH_CONFIG_FILENAME")
         if config_filename:
             config_file = config_filename
         cfg = config.load_named_config(config_file, DEFAULT_CONFIG)
         swhweb_config.update(cfg)
         config.prepare_folders(swhweb_config, "log_dir")
         if swhweb_config.get("search"):
             swhweb_config["search"] = get_search(**swhweb_config["search"])
         else:
             swhweb_config["search"] = None
         swhweb_config["storage"] = get_storage(**swhweb_config["storage"])
         swhweb_config["vault"] = get_vault(**swhweb_config["vault"])
         swhweb_config["indexer_storage"] = get_indexer_storage(
             **swhweb_config["indexer_storage"]
         )
         swhweb_config["scheduler"] = get_scheduler(**swhweb_config["scheduler"])
         swhweb_config["counters"] = get_counters(**swhweb_config["counters"])
     return swhweb_config
 
 
 def search():
     """Return the current application's search."""
     return get_config()["search"]
 
 
 def storage():
     """Return the current application's storage."""
     return get_config()["storage"]
 
 
 def vault():
     """Return the current application's vault."""
     return get_config()["vault"]
 
 
 def indexer_storage():
     """Return the current application's indexer storage."""
     return get_config()["indexer_storage"]
 
 
 def scheduler():
     """Return the current application's scheduler."""
     return get_config()["scheduler"]
 
 
 def counters():
     """Return the current application's counters."""
     return get_config()["counters"]
diff --git a/swh/web/deposit/__init__.py b/swh/web/deposit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/swh/web/templates/admin/deposit.html b/swh/web/deposit/templates/deposit-admin.html
similarity index 100%
rename from swh/web/templates/admin/deposit.html
rename to swh/web/deposit/templates/deposit-admin.html
diff --git a/swh/web/admin/deposit.py b/swh/web/deposit/urls.py
similarity index 69%
rename from swh/web/admin/deposit.py
rename to swh/web/deposit/urls.py
index 0be07976..84e747d9 100644
--- a/swh/web/admin/deposit.py
+++ b/swh/web/deposit/urls.py
@@ -1,44 +1,48 @@
 # Copyright (C) 2018-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 import requests
 from requests.auth import HTTPBasicAuth
 
 from django.conf import settings
 from django.contrib.auth.decorators import user_passes_test
 from django.http import JsonResponse
 from django.shortcuts import render
+from django.urls import re_path as url
 
-from swh.web.admin.adminurls import admin_route
 from swh.web.auth.utils import ADMIN_LIST_DEPOSIT_PERMISSION
 from swh.web.config import get_config
 
 
-def _can_list_deposits(user):
+def can_list_deposits(user):
     return user.is_staff or user.has_perm(ADMIN_LIST_DEPOSIT_PERMISSION)
 
 
-@admin_route(r"deposit/", view_name="admin-deposit")
-@user_passes_test(_can_list_deposits, login_url=settings.LOGIN_URL)
-def _admin_origin_save(request):
-    return render(request, "admin/deposit.html")
+@user_passes_test(can_list_deposits, login_url=settings.LOGIN_URL)
+def admin_deposit(request):
+    return render(request, "deposit-admin.html")
 
 
-@admin_route(r"deposit/list/", view_name="admin-deposit-list")
-@user_passes_test(_can_list_deposits, login_url=settings.LOGIN_URL)
-def _admin_deposit_list(request):
+@user_passes_test(can_list_deposits, login_url=settings.LOGIN_URL)
+def admin_deposit_list(request):
     config = get_config()["deposit"]
     private_api_url = config["private_api_url"].rstrip("/") + "/"
     deposits_list_url = private_api_url + "deposits/datatables/"
     deposits_list_auth = HTTPBasicAuth(
         config["private_api_user"], config["private_api_password"]
     )
 
     deposits = requests.get(
         deposits_list_url, auth=deposits_list_auth, params=request.GET, timeout=30
     ).json()
 
     return JsonResponse(deposits)
+
+
+urlpatterns = [
+    url(r"^admin/deposit/$", admin_deposit, name="admin-deposit"),
+    url(r"^admin/deposit/list/$", admin_deposit_list, name="admin-deposit-list"),
+]
diff --git a/swh/web/templates/layout.html b/swh/web/templates/layout.html
index 8ae81521..1f51295b 100644
--- a/swh/web/templates/layout.html
+++ b/swh/web/templates/layout.html
@@ -1,315 +1,315 @@
 {% comment %}
 Copyright (C) 2015-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 <!DOCTYPE html>
 
 {% load js_reverse %}
 {% load static %}
 {% load render_bundle from webpack_loader %}
 {% load swh_templatetags %}
 
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>{% block title %}{% endblock %}</title>
 
     {% render_bundle 'vendors' %}
     {% render_bundle 'webapp' %}
     {% render_bundle 'guided_tour' %}
 
     <script>
 /*
 @licstart  The following is the entire license notice for the JavaScript code in this page.
 
 Copyright (C) 2015-2022  The Software Heritage developers
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
 published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 @licend  The above is the entire license notice for the JavaScript code in this page.
 */
     </script>
 
     <script>
       SWH_CONFIG = {{swh_client_config|jsonify}};
       swh.webapp.sentryInit(SWH_CONFIG.sentry_dsn);
     </script>
 
     <script src="{% url 'js_reverse' %}" type="text/javascript"></script>
 
     <script>
       swh.webapp.setSwhObjectIcons({{ swh_object_icons|jsonify }});
     </script>
 
     {{ request.user.is_authenticated|json_script:"swh_user_logged_in" }}
 
     {% include "includes/favicon.html" %}
 
     {% block header %}{% endblock %}
 
     {% if swh_web_prod %}
 
       <!-- Matomo -->
       <script type="text/javascript">
         var _paq = window._paq = window._paq || [];
         _paq.push(['trackPageView']);
         (function() {
           var u="https://piwik.inria.fr/";
           _paq.push(['setTrackerUrl', u+'matomo.php']);
           _paq.push(['setSiteId', '59']);
           var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
           g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
         })();
       </script>
       <!-- End Matomo Code -->
 
     {% endif %}
 
   </head>
 
   <body class="hold-transition layout-fixed sidebar-mini {% if sidebar_state == 'collapsed' %} sidebar-collapse {% endif %}">
     <a id="top"></a>
     <div class="wrapper">
       <div class="swh-top-bar">
         <ul>
           <li class="swh-position-left">
             <div id="swh-full-width-switch-container" class="custom-control custom-switch d-none d-lg-block d-xl-block">
               <input type="checkbox" class="custom-control-input" id="swh-full-width-switch" onclick="swh.webapp.fullWidthToggled(event)">
               <label class="custom-control-label font-weight-normal" for="swh-full-width-switch">Full width</label>
             </div>
           </li>
           <li>
             <a href="https://www.softwareheritage.org">Home</a>
           </li>
           <li>
             <a href="https://forge.softwareheritage.org/">Development</a>
           </li>
           <li>
             <a href="https://docs.softwareheritage.org/devel/">Documentation</a>
           </li>
           <li>
             <a class="swh-donate-link" href="https://www.softwareheritage.org/donate">Donate</a>
           </li>
           <li class="swh-position-right">
             <a href="{{ status.server_url }}" target="_blank"
               class="swh-current-status mr-3 d-none d-lg-inline-block d-xl-inline-block">
               <span id="swh-current-status-description">Operational</span>
               <i class="swh-current-status-indicator green"></i>
             </a>
             {% url 'logout' as logout_url %}
             {% if user.is_authenticated %}
               Logged in as
               {% if 'OIDC' in user.backend %}
                 <a id="swh-login" href="{% url 'oidc-profile' %}"><strong>{{ user.username }}</strong></a>,
                 <a href=  "{% url 'oidc-logout' %}?next_path={% url 'logout' %}?remote_user=1">logout</a>
               {% else %}
                 <strong id="swh-login">{{ user.username }}</strong>,
                 <a href="{{ logout_url }}">logout</a>
               {% endif %}
             {% elif oidc_enabled %}
               {% if request.path != logout_url %}
                 <a id="swh-login" href="{% url 'oidc-login' %}?next_path={{ request.build_absolute_uri }}">login</a>
               {% else %}
                 <a id="swh-login" href="{% url 'oidc-login' %}">login</a>
               {% endif %}
             {% else %}
               {% if request.path != logout_url %}
                 <a id="swh-login" href="{% url 'login' %}?next={{ request.build_absolute_uri }}">login</a>
               {% else %}
                 <a id="swh-login" href="{% url 'login' %}">login</a>
               {% endif %}
             {% endif %}
           </li>
         </ul>
       </div>
       <div class="swh-banner">
         {% include "misc/hiring-banner.html" %}
       </div>
       <nav class="main-header navbar navbar-expand-lg navbar-light navbar-static-top" id="swh-navbar">
         <div class="navbar-header">
           <a class="nav-link swh-push-menu" data-widget="pushmenu" data-enable-remember="true" href="#">
             <i class="mdi mdi-24px mdi-menu mdi-fw" aria-hidden="true"></i>
           </a>
         </div>
         <div class="navbar" style="width: 94%;">
           <div class="swh-navbar-content">
             {% block navbar-content %}{% endblock %}
             {% if request.resolver_match.url_name != 'swh-web-homepage' and request.resolver_match.url_name != 'browse-search' %}
               <form class="form-horizontal d-none d-md-flex input-group swh-search-navbar needs-validation"
                   id="swh-origins-search-top">
                 <input class="form-control"
                   placeholder="Enter a SWHID to resolve or keyword(s) to search for in origin URLs"
                   type="text" id="swh-origins-search-top-input"
                   oninput="swh.webapp.validateSWHIDInput(this)" required/>
                 <div class="input-group-append">
                   <button class="btn btn-primary" type="submit">
                   <i class="swh-search-icon mdi mdi-24px mdi-magnify" aria-hidden="true"></i>
                   </button>
                 </div>
               </form>
             {% endif %}
           </div>
         </div>
       </nav>
     </div>
 
     <aside class="swh-sidebar main-sidebar sidebar-no-expand sidebar-light-primary elevation-4 swh-sidebar-{{ sidebar_state }}">
       <a href="{% url 'swh-web-homepage' %}" class="brand-link">
         <img class="brand-image" src="{% static 'img/swh-logo.png' %}">
         <div class="brand-text sitename" href="{% url 'swh-web-homepage' %}">
           <span class="first-word">Software</span> <span class="second-word">Heritage</span>
         </div>
       </a>
 
       <a href="/" class="swh-words-logo">
         <div class="swh-words-logo-swh">
           <span class="first-word">Software</span>
           <span class="second-word">Heritage</span>
         </div>
         <span>Archive</span>
       </a>
 
       <div class="sidebar">
         <nav class="mt-2">
           <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
             <li class="nav-header">Features</li>
             <li class="nav-item swh-search-item" title="Search archived software">
               <a href="{% url 'browse-search' %}" class="nav-link swh-search-link">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-magnify"></i>
                 <p>Search</p>
               </a>
             </li>
             <li class="nav-item swh-vault-item" title="Download archived software from the Vault">
               <a href="{% url 'browse-vault' %}" class="nav-link swh-vault-link">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-download"></i>
                 <p>Downloads</p>
               </a>
             </li>
             {% if "swh.web.save_code_now" in SWH_DJANGO_APPS %}
               <li class="nav-item swh-origin-save-item" title="Request the saving of a software origin into the archive">
                 <a href="{% url 'origin-save' %}" class="nav-link swh-origin-save-link">
                   <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-camera"></i>
                   <p>Save code now</p>
                 </a>
               </li>
             {% endif %}
             {% if "swh.web.add_forge_now" in SWH_DJANGO_APPS %}
             <li class="nav-item swh-add-forge-now-item" title="Request adding a new forge listing">
               <a href="{% url 'forge-add-create' %}" class="nav-link swh-add-forge-now-link">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-anvil"></i>
                 <p>Add forge now</p>
               </a>
             </li>
             {% endif %}
             <li class="nav-item swh-help-item" title="How to browse the archive ?">
               <a href="#" class="nav-link swh-help-link" onclick="swh.guided_tour.guidedTourButtonClick(event)">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-help-circle"></i>
                 <p>Help</p>
               </a>
             </li>
             {% if user.is_authenticated %}
               <li class="nav-header">Administration</li>
               {% if "swh.web.save_code_now" in SWH_DJANGO_APPS and user.is_staff %}
                 <li class="nav-item swh-origin-save-admin-item" title="Save code now administration">
                   <a href="{% url 'admin-origin-save-requests' %}" class="nav-link swh-origin-save-admin-link">
                     <i style="color: #fecd1b;" class="nav-icon mdi mdi-24px mdi-camera"></i>
                     <p>Save code now</p>
                   </a>
                 </li>
               {% endif %}
               {% if "swh.web.add_forge_now" in SWH_DJANGO_APPS %}
                 {% if user.is_staff or ADD_FORGE_MODERATOR_PERMISSION in user.get_all_permissions %}
                 <li class="nav-item swh-add-forge-now-moderation-item" title="Add forge now moderation">
                   <a href="{% url 'add-forge-now-requests-moderation' %}" class="nav-link swh-add-forge-now-moderation-link">
                     <i style="color: #fecd1b;" class="nav-icon mdi mdi-24px mdi-anvil"></i>
                     <p>Add forge now</p>
                   </a>
                 </li>
                 {% endif %}
               {% endif %}
-              {% if user.is_staff or ADMIN_LIST_DEPOSIT_PERMISSION in user.get_all_permissions %}
+              {% if "swh.web.deposit" in SWH_DJANGO_APPS and user.is_staff or ADMIN_LIST_DEPOSIT_PERMISSION in user.get_all_permissions %}
                 <li class="nav-item swh-deposit-admin-item" title="Deposit administration">
                   <a href="{% url 'admin-deposit' %}" class="nav-link swh-deposit-admin-link">
                     <i style="color: #fecd1b;" class="nav-icon mdi mdi-24px mdi-folder-upload"></i>
                     <p>Deposit</p>
                   </a>
                 </li>
               {% endif %}
               {% if "swh.web.mailmap" in SWH_DJANGO_APPS and MAILMAP_ADMIN_PERMISSION in user.get_all_permissions %}
                 <li class="nav-item swh-mailmap-admin-item" title="Mailmap administration">
                   <a href="{% url 'admin-mailmap' %}" class="nav-link swh-mailmap-admin-link">
                     <i style="color: #fecd1b;" class="nav-icon mdi mdi-24px mdi-email"></i>
                     <p>Mailmap</p>
                   </a>
                 </li>
               {% endif %}
             {% endif %}
           </ul>
         </nav>
       </div>
     </aside>
 
     <div class="content-wrapper">
       <section class="content">
         <div class="container" id="swh-web-content">
           {% if swh_web_staging %}
             <div class="swh-corner-ribbon">Staging<br/>v{{ swh_web_version }}</div>
           {% elif swh_web_dev %}
             <div class="swh-corner-ribbon">Development<br/>v{{ swh_web_version|split:"+"|first }}</div>
           {% endif %}
           {% block content %}{% endblock %}
         </div>
       </section>
     </div>
 
     {% include "includes/global-modals.html" %}
 
     <footer class="footer">
       <div class="container text-center">
         <a href="https://www.softwareheritage.org">Software Heritage</a> &mdash;
         Copyright (C) 2015&ndash;{% now "Y" %}, The Software Heritage developers.
         License: <a href="https://www.gnu.org/licenses/agpl.html">GNU
         AGPLv3+</a>. <br/> The source code of Software Heritage <em>itself</em>
         is available on
         our <a href="https://forge.softwareheritage.org/">development
         forge</a>. <br/> The source code files <em>archived</em> by Software
         Heritage are available under their own copyright and licenses. <br/>
         <span class="link-color">Terms of use: </span>
         <a href="https://www.softwareheritage.org/legal/bulk-access-terms-of-use/">Archive access</a>,
         <a href="https://www.softwareheritage.org/legal/api-terms-of-use/">API</a>-
         <a href="https://www.softwareheritage.org/contact/">Contact</a>-
         <a href="{% url 'jslicenses' %}" rel="jslicense">JavaScript license information</a>-
         <a href="{% url 'api-1-homepage' %}">Web API</a><br/>
         {% if "production" not in DJANGO_SETTINGS_MODULE  %}
           swh-web v{{ swh_web_version }}
         {% endif %}
       </div>
     </footer>
     <div id="back-to-top">
       <a href="#top"><img alt="back to top" src="{% static 'img/arrow-up-small.png' %}" /></a>
     </div>
     <script>
       swh.webapp.setContainerFullWidth();
       var statusServerURL = {{ status.server_url|jsonify }};
       var statusJsonPath = {{ status.json_path|jsonify }};
       swh.webapp.initStatusWidget(statusServerURL + statusJsonPath);
     </script>
   </body>
 
 </html>
diff --git a/swh/web/tests/deposit/__init__.py b/swh/web/tests/deposit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/swh/web/tests/deposit/test_app.py b/swh/web/tests/deposit/test_app.py
new file mode 100644
index 00000000..27320035
--- /dev/null
+++ b/swh/web/tests/deposit/test_app.py
@@ -0,0 +1,32 @@
+# Copyright (C) 2022  The Software Heritage developers
+# See the AUTHORS file at the top-level directory of this distribution
+# License: GNU Affero General Public License version 3, or any later version
+# See top-level LICENSE file for more information
+
+import pytest
+
+from django.urls import get_resolver
+
+from swh.web.common.utils import reverse
+from swh.web.deposit.urls import urlpatterns
+from swh.web.tests.django_asserts import assert_not_contains
+from swh.web.tests.utils import check_html_get_response
+
+
+@pytest.mark.django_db
+def test_deposit_deactivate(client, staff_user, django_settings):
+    """Check Add forge now feature is deactivated when the swh.web.deposit django
+    application is not in installed apps."""
+
+    django_settings.SWH_DJANGO_APPS = [
+        app for app in django_settings.SWH_DJANGO_APPS if app != "swh.web.deposit"
+    ]
+
+    url = reverse("swh-web-homepage")
+    client.force_login(staff_user)
+    resp = check_html_get_response(client, url, status_code=200)
+    assert_not_contains(resp, "swh-deposit-admin-item")
+
+    add_forge_now_view_names = set(urlpattern.name for urlpattern in urlpatterns)
+    all_view_names = set(get_resolver().reverse_dict.keys())
+    assert add_forge_now_view_names & all_view_names == set()
diff --git a/swh/web/tests/admin/test_deposit.py b/swh/web/tests/deposit/test_views.py
similarity index 95%
rename from swh/web/tests/admin/test_deposit.py
rename to swh/web/tests/deposit/test_views.py
index 75f64aed..4ae7b12c 100644
--- a/swh/web/tests/admin/test_deposit.py
+++ b/swh/web/tests/deposit/test_views.py
@@ -1,101 +1,101 @@
 # Copyright (C) 2021-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from base64 import b64encode
 
 import pytest
 
 from swh.web.auth.utils import ADMIN_LIST_DEPOSIT_PERMISSION
 from swh.web.common.utils import reverse
 from swh.web.config import get_config
 from swh.web.tests.utils import (
     check_html_get_response,
     check_http_get_response,
     create_django_permission,
 )
 
 
 def test_deposit_admin_view_not_available_for_anonymous_user(client):
     url = reverse("admin-deposit")
     resp = check_html_get_response(client, url, status_code=302)
     assert resp["location"] == reverse("login", query_params={"next": url})
 
 
 @pytest.mark.django_db
 def test_deposit_admin_view_available_for_staff_user(client, staff_user):
     client.force_login(staff_user)
     url = reverse("admin-deposit")
     check_html_get_response(
-        client, url, status_code=200, template_used="admin/deposit.html"
+        client, url, status_code=200, template_used="deposit-admin.html"
     )
 
 
 @pytest.mark.django_db
 def test_deposit_admin_view_available_for_user_with_permission(client, regular_user):
     regular_user.user_permissions.add(
         create_django_permission(ADMIN_LIST_DEPOSIT_PERMISSION)
     )
     client.force_login(regular_user)
     url = reverse("admin-deposit")
     check_html_get_response(
-        client, url, status_code=200, template_used="admin/deposit.html"
+        client, url, status_code=200, template_used="deposit-admin.html"
     )
 
 
 @pytest.mark.django_db
 def test_deposit_admin_view_list_deposits(client, staff_user, requests_mock):
     deposits_data = {
         "data": [
             {
                 "external_id": "hal-02527986",
                 "id": 1066,
                 "raw_metadata": None,
                 "reception_date": "2022-04-08T14:12:34.143000Z",
                 "status": "rejected",
                 "status_detail": None,
                 "swhid": None,
                 "swhid_context": None,
                 "type": "code",
                 "uri": "https://inria.halpreprod.archives-ouvertes.fr/hal-02527986",
             },
             {
                 "external_id": "hal-01243573",
                 "id": 1065,
                 "raw_metadata": None,
                 "reception_date": "2022-04-08T12:53:50.940000Z",
                 "status": "rejected",
                 "status_detail": None,
                 "swhid": None,
                 "swhid_context": None,
                 "type": "code",
                 "uri": "https://inria.halpreprod.archives-ouvertes.fr/hal-01243573",
             },
         ],
         "draw": 2,
         "recordsFiltered": 645,
         "recordsTotal": 1066,
     }
 
     config = get_config()["deposit"]
     private_api_url = config["private_api_url"].rstrip("/") + "/"
     deposits_list_url = private_api_url + "deposits/datatables/"
 
     basic_auth_payload = (
         config["private_api_user"] + ":" + config["private_api_password"]
     ).encode()
 
     requests_mock.get(
         deposits_list_url,
         json=deposits_data,
         request_headers={
             "Authorization": f"Basic {b64encode(basic_auth_payload).decode('ascii')}"
         },
     )
 
     client.force_login(staff_user)
     url = reverse("admin-deposit-list")
     check_http_get_response(
         client, url, status_code=200, content_type="application/json"
     )