diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 8e179e63ac..d7cfe6ea57 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -693,6 +693,11 @@ class Application extends SilexApplication
         return count(\User_Adapter::getInstance($usrId, $this)->ACL()->get_granted_base()) > 0;
     }
 
+    public function hasTermsOfUse()
+    {
+        return '' !== \databox_cgu::getHome($this);
+    }
+
     /**
      * Returns an an array of available collection for offline queries
      *
diff --git a/lib/classes/login.php b/lib/classes/login.php
index 21459468fe..312066cd00 100644
--- a/lib/classes/login.php
+++ b/lib/classes/login.php
@@ -1,12 +1,5 @@
 <?php
 
-use Alchemy\Phrasea\Application;
-
 class login
 {
-
-    public function get_cgus(Application $app)
-    {
-        return databox_cgu::getHome($app);
-    }
 }
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig
index 0d55e9f2f6..7fbd9f90e1 100644
--- a/templates/web/login/layout/base-layout.html.twig
+++ b/templates/web/login/layout/base-layout.html.twig
@@ -78,7 +78,7 @@
                                                    <li>
                                                       <a href="#">{% trans "Help" %}</a>
                                                    </li>
-                                                   {% if login.get_cgus(app) is not empty %}
+                                                   {% if app.hasTermsOfUse() %}
                                                        <li>
                                                            {% block tou_link %}
                                                                <a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a>