diff --git a/core/defaultconfigs/server.py b/core/defaultconfigs/server.py
index f93d533..b6237b8 100644
--- a/core/defaultconfigs/server.py
+++ b/core/defaultconfigs/server.py
@@ -10,7 +10,8 @@ kcconf.configkopano({
         'attachment_path': "/kopano/data/attachments/",
         'user_plugin': "ldap",
         'server_listen': "*:236",
-        'server_listen_tls': "*:237"
+        'server_listen_tls': "*:237",
+	'server_name': "kopano"
     }
 })
 
diff --git a/core/healthcheck.sh b/core/healthcheck.sh
index cc8bb5e..71ce057 100644
--- a/core/healthcheck.sh
+++ b/core/healthcheck.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
+set -e
+
 case "$SERVICE_TO_START" in
 server)
-	dockerize \
-	-wait tcp://localhost:237 \
-	([ -f /kopano/data/.user-sync ] || kopano-cli --sync; touch /kopano/data/.user-sync)
+	kopano-cli --list-users
 	exit 0
 	;;
 esac