Fixes duplicate user entries in the User map
Fixes quote responses.