Fix the user templates