diff --git a/modules/s3cfg.py b/modules/s3cfg.py
index 5c785942aa..1cc2c4f2ff 100644
--- a/modules/s3cfg.py
+++ b/modules/s3cfg.py
@@ -146,6 +146,7 @@ def __init__(self):
         self.supply = Storage()
         self.search = Storage()
         self.security = Storage()
+        self.setup = Storage()
         self.sync = Storage()
         self.ui = Storage()
         self.vulnerability = Storage()
@@ -1970,6 +1971,14 @@ def get_search_filter_manager_load(self):
         """ Text for saved filter load-button """
         return self.search.get("filter_manager_load", None)
 
+    # =========================================================================
+    # Setup
+    #
+    def get_setup_url(self):
+        """ URL for Setup Coapp """
+
+        return self.setup.get("url", None)
+
     # =========================================================================
     # Sync
     #
diff --git a/modules/s3menus.py b/modules/s3menus.py
index 97fea24016..377472dc4f 100644
--- a/modules/s3menus.py
+++ b/modules/s3menus.py
@@ -265,6 +265,9 @@ def menu_admin(cls, **attr):
                                    check=translate),
                                 MM("Test Results", f="result"),
                             )
+            setup_url = settings.get_setup_url()
+            if setup_url:
+                menu_admin.append(MM("Setup Coapp", url=setup_url))
         elif s3_has_role("ORG_ADMIN"):
             menu_admin = MM(name_nice, c="admin", f="user", **attr)()
         else: