Some of Braden’s and my changes to the users controller got lost in a nasty merge problem.