Initial commit of changes to user edit forms