UserManager added some code /Gonz