diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss
index ced678213..574343485 100644
--- a/frontend/resources/styles/main/layouts/login.scss
+++ b/frontend/resources/styles/main/layouts/login.scss
@@ -200,4 +200,3 @@
     margin: 0 $size-2;
   }
 }
-
diff --git a/frontend/src/app/config.cljs b/frontend/src/app/config.cljs
index 58b03b299..456f163a7 100644
--- a/frontend/src/app/config.cljs
+++ b/frontend/src/app/config.cljs
@@ -86,6 +86,9 @@
 (def browser              (atom (parse-browser)))
 (def platform             (atom (parse-platform)))
 
+(def terms-of-service-uri (obj/get global "penpotTermsOfServiceURI" nil))
+(def privacy-policy-uri   (obj/get global "penpotPrivacyPolicyURI" nil))
+
 ;; maintain for backward compatibility
 (let [login-with-ldap (obj/get global "penpotLoginWithLDAP" false)
       registration    (obj/get global "penpotRegistrationEnabled" true)]
@@ -135,5 +138,3 @@
    (str (cond-> (u/join public-uri "assets/by-file-media-id/")
           (true? thumbnail?) (u/join (str id "/thumbnail"))
           (false? thumbnail?) (u/join (str id))))))
-
-
diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs
index 9c79ed2dd..3b00adacb 100644
--- a/frontend/src/app/main/ui/auth.cljs
+++ b/frontend/src/app/main/ui/auth.cljs
@@ -6,6 +6,7 @@
 
 (ns app.main.ui.auth
   (:require
+   [app.config :as cf]
    [app.main.ui.auth.login :refer [login-page]]
    [app.main.ui.auth.recovery :refer [recovery-page]]
    [app.main.ui.auth.recovery-request :refer [recovery-request-page]]
@@ -15,6 +16,23 @@
    [app.util.i18n :as i18n :refer [tr]]
    [rumext.alpha :as mf]))
 
+(mf/defc terms-login
+  []
+  (let [show-all?     (and cf/terms-of-service-uri cf/privacy-policy-uri)
+        show-terms?   (some? cf/terms-of-service-uri)
+        show-privacy? (some? cf/privacy-policy-uri)]
+
+    (when show-all?
+      [:div.terms-login
+       (when show-terms?
+         [:a {:href cf/terms-of-service-uri :target "_blank"} "Terms of service"])
+
+       (when show-all?
+         [:span "and"])
+
+       (when show-privacy?
+         [:a {:href cf/privacy-policy-uri :target "_blank"} "Privacy policy"])])))
+
 (mf/defc auth
   [{:keys [route] :as props}]
   (let [section (get-in route [:data :name])
@@ -48,7 +66,5 @@
         :auth-recovery
         [:& recovery-page {:params params}])
 
-      [:div.terms-login
-       [:a {:href "https://penpot.app/terms.html" :target "_blank"} "Terms of service"]
-       [:span "and"]
-       [:a {:href "https://penpot.app/privacy.html" :target "_blank"} "Privacy policy"]]]]))
+      [:& terms-login {}]]]))
+