diff --git a/thelounge/config.json b/thelounge/config.json
index 11e7b43..e927875 100644
--- a/thelounge/config.json
+++ b/thelounge/config.json
@@ -38,7 +38,8 @@
     "default_theme": "default",
     "themes": [
       "thelounge-theme-material"
-    ]
+    ],
+    "users": []
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
@@ -48,6 +49,9 @@
     "default_theme": "str",
     "themes": [
       "str"
+    ],
+    "users": [
+      "str"
     ]
   }
 }
diff --git a/thelounge/rootfs/etc/cont-init.d/thelounge.sh b/thelounge/rootfs/etc/cont-init.d/thelounge.sh
index d5bc533..ece92a4 100644
--- a/thelounge/rootfs/etc/cont-init.d/thelounge.sh
+++ b/thelounge/rootfs/etc/cont-init.d/thelounge.sh
@@ -6,12 +6,21 @@
 export THELOUNGE_HOME=/data/thelounge
 
 if ! bashio::fs.directory_exists "/data/thelounge"; then
-    bashio::log.info "Creating default hassio user.."
     mkdir -p /data/thelounge/users
-    cp /etc/thelounge/users/hassio.json /data/thelounge/users
-else
-    for theme in $(bashio::config "themes")
-    do
-        /usr/local/bin/thelounge install "${theme}"
-    done
 fi
+
+# List current users
+/usr/local/bin/thelounge list
+
+for user in $(bashio::config "users")
+do
+    if ! bashio::fs.file "/data/thelounge/users/${user}.json"; then
+        bashio::log.info "Creating user ${user} with default password.."
+        cp /etc/thelounge/users/hassio.json "/data/thelounge/users/${user}.json"
+    fi
+done
+
+for theme in $(bashio::config "themes")
+do
+    /usr/local/bin/thelounge install "${theme}"
+done