[EXT-109] Moved user update code fixed overwrites

Replaced admin checks surrounding update_user_data and put it inside
update_user_data (DRY).

also added some one liner comments to help clear up what's going on
with the code.