diff --git a/app/static/js/Requests/users/settings.js b/app/static/js/Requests/users/settings.js
index 7584e9bbb2f0ff4419be7618a983b4c40fba63b5..609ecb356fec6f8b411ea21fd7332ca6abd0eae7 100644
--- a/app/static/js/Requests/users/settings.js
+++ b/app/static/js/Requests/users/settings.js
@@ -15,10 +15,3 @@ Requests.users.entity.settings.profilePrivacy.update = (userId, profilePrivacySe
   return Requests.JSONfetch(input, init);
 };
 
-Requests.users.entity.settings.acceptTermsOfUse = () => {
-  let input = `/users/accept-terms-of-use`;
-  let init = {
-    method: 'POST'
-  };
-  return Requests.JSONfetch(input, init);
-};
diff --git a/app/static/js/Requests/users/users.js b/app/static/js/Requests/users/users.js
index 053fd687089fd118720d1c65667205e0ffdd0e4c..4baf4717867a1f445171e5d56e27d4e88cf98c66 100644
--- a/app/static/js/Requests/users/users.js
+++ b/app/static/js/Requests/users/users.js
@@ -14,6 +14,15 @@ Requests.users.entity.delete = (userId) => {
   return Requests.JSONfetch(input, init);
 };
 
+Requests.users.entity.acceptTermsOfUse = () => {
+  let input = `/users/accept-terms-of-use`;
+  let init = {
+    method: 'POST'
+  };
+  return Requests.JSONfetch(input, init);
+};
+
+
 Requests.users.entity.avatar = {};
 
 Requests.users.entity.avatar.delete = (userId) => {
@@ -23,3 +32,4 @@ Requests.users.entity.avatar.delete = (userId) => {
   };
   return Requests.JSONfetch(input, init);
 }
+
diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2
index 5749d86bd5d993ea0418ec286f1a47750899cb5a..b63c8c397a72135c3ac51d0ce14f8ec865c1c70a 100644
--- a/app/templates/_scripts.html.j2
+++ b/app/templates/_scripts.html.j2
@@ -115,14 +115,12 @@
     {
       dismissible: false, 
       onCloseEnd: () => {
-        Requests.users.entity.settings.acceptTermsOfUse();
+        Requests.users.entity.acceptTermsOfUse();
       }
     }
   );
-  {% if current_user.is_authenticated %}
-    {% if not current_user.terms_of_use_accepted %}
+  {% if current_user.is_authenticated and not current_user.terms_of_use_accepted %}
       termsOfUseModal.M_Modal.open();
-    {% endif %}
   {% endif %}
 
 </script>
diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index 22ba16e1c2487ec76f76e1375bf67d9c87ac02fb..9dd20f08e42a583c07528248c21c13d20a1d1f3a 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -38,7 +38,9 @@
   {# {% if current_user.is_authenticated %}
   {% include "_roadmap.html.j2" %}
   {% endif %} #}
-  {% include "_terms_of_use_modal.html.j2" %}
+  {% if current_user.is_authenticated and not current_user.terms_of_use_accepted %}
+    {% include "_terms_of_use_modal.html.j2" %}
+  {% endif %}
   {% endblock modals %}
 </div>
 {% endblock main %}