Added consistency to the user edit form