Various Changes - user edit form