User manager multiple fixes