RegisteredUserMapper modified