diff --git a/data/Dockerfiles/ejabberd/docker-entrypoint.sh b/data/Dockerfiles/ejabberd/docker-entrypoint.sh
index 3853def7..aa2c15f0 100755
--- a/data/Dockerfiles/ejabberd/docker-entrypoint.sh
+++ b/data/Dockerfiles/ejabberd/docker-entrypoint.sh
@@ -27,11 +27,16 @@ chown -R root:root /var/www/authentication
 
 [ ! -f /sqlite/sqlite.db ] && cp /sqlite/sqlite_template.db /sqlite/sqlite.db
 
+[ ! -d /ejabberd_ssl ] && mkdir /ejabberd_ssl
+cp /ssl/cert.pem /ejabberd_ssl/cert.pem
+cp /ssl/key.pem /ejabberd_ssl/key.pem
+
 # Write access to upload directory and log file for authenticator
 touch /var/www/authentication/auth.log
 chown -R ejabberd:ejabberd /var/www/upload \
   /var/www/authentication/auth.log \
-  /sqlite
+  /sqlite \
+  /ejabberd_ssl
 
 # ACL file for vhosts, hosts file for vhosts
 touch /ejabberd/ejabberd_acl.yml \
diff --git a/data/conf/ejabberd/ejabberd.yml b/data/conf/ejabberd/ejabberd.yml
index d63bae3f..2c1ed238 100644
--- a/data/conf/ejabberd/ejabberd.yml
+++ b/data/conf/ejabberd/ejabberd.yml
@@ -34,6 +34,10 @@ sql_type: sqlite
 sql_database: /sqlite/sqlite.db
 default_db: sql
 
+certfiles:
+  - /ejabberd_ssl/cert.pem
+  - /ejabberd_ssl/key.pem
+
 listen:
   -
     port: 5222
diff --git a/data/web/debug.php b/data/web/debug.php
index 04ee431d..bcc16d0a 100644
--- a/data/web/debug.php
+++ b/data/web/debug.php
@@ -108,7 +108,7 @@ $xmpp_status = xmpp_control('status');
                   <?php
                   if ($xmpp_status !== false) {
                   ?>
-                    <p><?=$lang['debug']['online_users'];?>: <?=$xmpp_status['onlineusers'];?></p>
+                    <p><?=$lang['debug']['online_users'];?>: <?=(empty($xmpp_status['onlineusers'])) ? '-' : $xmpp_status['onlineusers'];?></p>
                     <p><?=$lang['debug']['started_at'];?>: <span class="parse_s_ago"><?=$xmpp_status['uptimeseconds'];?></span></p>
                     <?php
                     if (!empty($xmpp_status['muc_online_rooms'])) {