diff --git a/openbis/dist/server/service.properties b/openbis/dist/server/service.properties
index 26132d36816dfb5a8d3ddb1d5d0b5948f1671111..911b63a1f56df90b241e0da94be1851fbe029472 100644
--- a/openbis/dist/server/service.properties
+++ b/openbis/dist/server/service.properties
@@ -153,4 +153,10 @@ onlinehelp.generic.page-template = https://wiki-bsse.ethz.ch/pages/createpage.ac
 #demo.class = ch.systemsx.cisd.openbis.generic.server.task.DemoMaintenanceTask
 #demo.interval = 60
 #demo.property_1 = some value
-#demo.property_2 = some value 2
\ No newline at end of file
+#demo.property_2 = some value 2
+
+# ---------------------------------------------------------------------------
+# anonymous login configuration
+# ---------------------------------------------------------------------------
+# Login of the existing user whose settings will be used for anonymous login 
+#user-for-anonymous-login = <user-login>
\ No newline at end of file
diff --git a/openbis/dist/server/web-client.properties b/openbis/dist/server/web-client.properties
index 9b46f1e7af0b552112eb3b64437bbc3dd779fe3d..1e2e90140e850d767ea0956991b6d2c5b99b3c45 100644
--- a/openbis/dist/server/web-client.properties
+++ b/openbis/dist/server/web-client.properties
@@ -1,8 +1,16 @@
 # Default view mode that should be used if user doesn't have it specified in URL. 
-# Options: 'NORMAL' (standard mode - default), 'SIMPLE' (readonly mode with simplified GUI) 
+# Options: 
+#  'NORMAL' (standard mode - default), 
+#  'SIMPLE' (readonly mode with simplified GUI), 
+#  'EMBEDDED' (similar to 'SIMPLE', suitable to be embedded on external pages) 
 #
 #default-view-mode = SIMPLE
 
+# Flag specifying whether default login mode is anonymous or not. 
+# If true a user-for-anonymous-login has to be defined in service.properties
+# Default value: false
+# default-anonymous-login = true
+
 # Maximal number of visible columns in tables. Default: 50.
 #max-visible-columns = 20
 
diff --git a/screening/dist/server/service.properties b/screening/dist/server/service.properties
index 251df86f8943361eb63a56a41c6a843eb34635c5..4ec7a78752383a11189b2329dd691c86f187cda5 100644
--- a/screening/dist/server/service.properties
+++ b/screening/dist/server/service.properties
@@ -59,4 +59,10 @@ hibernate.search.maxResults = 100000
 # If 'async', the update of indices will be done in a separate thread.
 hibernate.search.worker.execution=async
 
-web-client-configuration-file = etc/web-client.properties
\ No newline at end of file
+web-client-configuration-file = etc/web-client.properties
+
+# ---------------------------------------------------------------------------
+# anonymous login configuration
+# ---------------------------------------------------------------------------
+# Login of the existing user whose settings will be used for anonymous login 
+#user-for-anonymous-login = <user-login>
\ No newline at end of file
diff --git a/screening/dist/server/web-client.properties b/screening/dist/server/web-client.properties
index 09a05fd78e0b0cb84c4366d8dc24cb76b3900c9d..599f7741f257543711ced3696e4c82bf1083b7de 100644
--- a/screening/dist/server/web-client.properties
+++ b/screening/dist/server/web-client.properties
@@ -1,8 +1,16 @@
 # Default view mode that should be used if user doesn't have it specified in URL. 
-# Options: 'NORMAL' (standard mode - default), 'SIMPLE' (readonly mode with simplified GUI) 
+# Options: 
+#  'NORMAL' (standard mode - default), 
+#  'SIMPLE' (readonly mode with simplified GUI), 
+#  'EMBEDDED' (similar to 'SIMPLE', suitable to be embedded on external pages) 
 #
 #default-view-mode = SIMPLE
 
+# Flag specifying whether default login mode is anonymous or not. 
+# If true a user-for-anonymous-login has to be defined in service.properties
+# Default value: false
+# default-anonymous-login = true
+
 # Maximal number of visible columns in tables. Default: 50.
 #max-visible-columns = 20