--- a/mod_mam/mod_mam.lua	Tue Jan 19 17:59:05 2016 +0100
+++ b/mod_mam/mod_mam.lua	Tue Jan 19 18:04:24 2016 +0100
@@ -306,7 +306,7 @@
 			if not ok then
 				module:log("warn", "Could not expire archives for user %s: %s", user, err);
 			end
-			user[cleanup] = nil;
+			cleanup[user] = nil;
 		end
 		return cleanup_interval;
 	end);