CS-5435 - Rewrite/Optimize saving users points