diff --git a/js-test/servers/common/openBIS-server/etc/service.properties b/js-test/servers/common/openBIS-server/etc/service.properties
index 288dbe25af96844bc75fedd71f67aec354afe95c..e750d54ee21c229eb671293f286e32e326a26be4 100644
--- a/js-test/servers/common/openBIS-server/etc/service.properties
+++ b/js-test/servers/common/openBIS-server/etc/service.properties
@@ -130,6 +130,7 @@ trusted-cross-origin-domains=*
 # ---------------------------------------------------------------------------
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720
+max-number-of-sessions-per-user = 0
 
 # ---------------------------------------------------------------------------
 # Business rules configuration
diff --git a/openbis/source/java/service.properties b/openbis/source/java/service.properties
index 9094f3ce5928771f42d13cba4611a766ef4c289d..aba585ceb49aed9663e64929fdd1f2d26f29fea1 100644
--- a/openbis/source/java/service.properties
+++ b/openbis/source/java/service.properties
@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 session-workspace-root-dir = targets/session-workspace
 
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
index 599b46bc2ae77f9706510f8e10557a81837b0876..19b825d9464490448c8b522e805ded4b401c6dd1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
@@ -101,7 +101,7 @@ public class SimplePropertyValidatorTest
                     "M/d/yy HH:mm\n" +
                     "yyyy-MM-dd HH:mm:ss Z\n" +
                     "yyyy-MM-dd'T'HH:mm:ssX\n" +
-                    "yyyy-MM-dd HH:mm:ss ZZZ\n" +
+                    "yyyy-MM-dd HH:mm:ss Z\n" +
                     "yyyy-MM-dd'T'HH:mm:ssXXX]'.");
         }
     }
diff --git a/openbis_standard_technologies/dist/server/service.properties b/openbis_standard_technologies/dist/server/service.properties
index a7bbc6e7cca29d6e19c5384c74ec49174b90417d..bcbe9b8b1c22a17b32e8edca36d1c8986073f95d 100644
--- a/openbis_standard_technologies/dist/server/service.properties
+++ b/openbis_standard_technologies/dist/server/service.properties
@@ -173,7 +173,7 @@ session-timeout = 720
 # Session time (in minutes) in case of presents of file etc/nologin.html. Should be < 30. 
 #session-timeout-no-login = 10
 
-# Maximum number of sessions allowed per user. Default value is 1.
+# Maximum number of sessions allowed per user. Zero means unlimited number of sessions. Default value is 1.
 # max-number-of-sessions-per-user = 1
 
 # Comma separated list of users allowed to have unlimited number of sessions. Default: Empty list.
diff --git a/screening/source/java/service.properties b/screening/source/java/service.properties
index 54ea1996dee1c979ffd2cda4c6cc582932af8687..c8f492aa0e35bdad5ae098dfcecb4d523f470f48 100644
--- a/screening/source/java/service.properties
+++ b/screening/source/java/service.properties
@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 session-workspace-root-dir = targets/session-workspace
 
diff --git a/ui-test/resource/service.properties b/ui-test/resource/service.properties
index ca31420f298374fc16fb6baa90a4338d775ee5d3..c9a308a53d4b229aea6107a7e2f6d041a451ed3e 100644
--- a/ui-test/resource/service.properties
+++ b/ui-test/resource/service.properties
@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 # Authorization
 # Supported: 'no-authorization' and 'active-authorization'