Issue #2395153 by mwisner: User created fields are not being saved on sites
Code cleanup