All user fields now saved
Merge branch 'editpage'