diff --git a/daiquiri/auth/templates/account/terms_of_use.html b/daiquiri/auth/templates/account/terms_of_use.html
index 1adef784..b3d150df 100644
--- a/daiquiri/auth/templates/account/terms_of_use.html
+++ b/daiquiri/auth/templates/account/terms_of_use.html
@@ -9,16 +9,16 @@
 }
 </style>
 
-<h4>Using webservice facilities at AIP</h4>
+<h4>Using webservice facilities at {{ settings.SITE_PUBLISHER }} </h4>
 <hr>
 <ol>
   <li>
     <p>
-    Registering for use of a webservice at AIP is creating an account for the webservice.
+    Registering for use of a webservice at {{ settings.SITE_PUBLISHER }} is creating an account for the webservice.
     </p>
     <p>
     A registered user is provided with a limited storage space to cache their results from
-    queries to data provided via this webservice. 
+    queries to data provided via this webservice.
     </p>
   </li>
 
@@ -32,28 +32,28 @@ <h4>Using webservice facilities at AIP</h4>
     dowloading to other storage location.
     </p>
     <p>
-    The usage includes the management of the allocated storage space by the registered user 
+    The usage includes the management of the allocated storage space by the registered user
     by provided means (via TAP protocol or web interface).
     </p>
   </li>
 
   <li>
     <p>
-    The AIP reserves the right to remove the allocated storage
+    The {{ settings.SITE_PUBLISHER }} reserves the right to remove the allocated storage
       <ul>
         <li>if this is used for illegal, commercial or other private purposes,</li>
         <li>the user is using the provided account for attacking the service.</li>
       </ul>
     </p>
     <p>
-    The AIP also reserves the right to terminate the account unlaterally without recourse 
+    The {{ settings.SITE_PUBLISHER }} also reserves the right to terminate the account unlaterally without recourse
     if the usage is deemed harmful or unlawful.
     </p>
   </li>
 
   <li>
     <p>
-    For creating the user account only minimal personal data is collected. 
+    For creating the user account only minimal personal data is collected.
     </p>
     <p>
     The collected personal data is neither used for other than the stated means,
@@ -64,11 +64,11 @@ <h4>Using webservice facilities at AIP</h4>
 
   <li>
     <p>
-    Neither the API, nor the webservice providers shall be held accountable for any 
-    loss of data or data integrity of the user's storage space. 
+    Neither the {{ settings.SITE_PUBLISHER }} , nor the webservice providers shall be held accountable for any
+    loss of data or data integrity of the user's storage space.
     </p>
     <p>
-    No guarantee is provided that login is possible at all times. 
+    No guarantee is provided that login is possible at all times.
     </p>
     <p>
     The service is offered on a best effort basis.
@@ -77,7 +77,7 @@ <h4>Using webservice facilities at AIP</h4>
 
   <li>
     <p>
-    By acknowledigng these terms the user is consenting to the above statements. 
+    By acknowledigng these terms the user is consenting to the above statements.
     </p>
   </li>
 </ol>
diff --git a/daiquiri/core/settings/django.py b/daiquiri/core/settings/django.py
index 9ec0aed5..26217d43 100644
--- a/daiquiri/core/settings/django.py
+++ b/daiquiri/core/settings/django.py
@@ -214,6 +214,7 @@
     'ACCOUNT_LOGOUT_ON_GET',
     'AUTH_WORKFLOW',
     'AUTH_TERMS_OF_USE',
+    'SITE_PUBLISHER',
     'METADATA_COLUMN_PERMISSIONS',
     'QUERY_DROPDOWN_FUNCTIONS',
     'QUERY_DROPDOWNS',