Updated user creation and edit forms to be aligned