Brush up the UserAccount controller