# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1744297674 -3600
# Node ID bb15cbb856a133052b896a6effe7999946ee2f6b
# Parent  31fa834108bc5d2bf3112a3c0cc2dcc6cf7b1f08# Parent  87dd8639f08f6c5a4cf85679c90611abf0ea0568
Merge 13.0->trunk

diff -r 31fa834108bc -r bb15cbb856a1 plugins/mod_invites_register.lua
--- a/plugins/mod_invites_register.lua	Thu Apr 10 11:33:47 2025 +0100
+++ b/plugins/mod_invites_register.lua	Thu Apr 10 16:07:54 2025 +0100
@@ -101,8 +101,20 @@
 		-- for this module to do...
 		return;
 	end
-	if validated_invite and validated_invite.additional_data and validated_invite.additional_data.allow_reset then
-		event.allow_reset = validated_invite.additional_data.allow_reset;
+	if validated_invite then
+		local username = validated_invite.username;
+		if username and username ~= event.username then
+			event.allowed = false;
+			event.reason = "The chosen username is not valid with this invitation";
+		end
+		local reset_username = validated_invite.additional_data and validated_invite.additional_data.allow_reset;
+		if reset_username then
+			if reset_username ~= event.username then
+				event.allowed = false;
+				event.reason = "Incorrect username for password reset";
+			end
+			event.allow_reset = reset_username;
+		end
 	end
 end);