A few things were reverted and made the output html of the edit user page nicer