Fixed user match saving