diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4345297..c73c460 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2025-XX-XX - Tiny Cloud v3.2.1
+
+* Fix cloud-config user creation -- `users` would reuse values from previous
+  user if unset.
+
 ## 2025-06-30 - Tiny Cloud v3.2.0
 
 * Initial support for `digitalocean` cloud provider
diff --git a/lib/tiny-cloud/user-data/cloud-config b/lib/tiny-cloud/user-data/cloud-config
index 24904de..e2ebcc6 100644
--- a/lib/tiny-cloud/user-data/cloud-config
+++ b/lib/tiny-cloud/user-data/cloud-config
@@ -243,7 +243,7 @@ in_list() {
 init__userdata_users() {
 	local users="$(get_userdata users)"
 	for i in $users; do
-		local name gecos homedir shell primary_group groups
+		local name="" gecos="" homedir="" shell="" primary_group="" groups=""
 		local system=false no_create_home=false lock_passwd=true
 		local keys="$(get_userdata users/$i)"
 		if [ "$i" = 1 ] && [ "$keys" = "default" ]; then