Fix bugs in current_user assignment
Finish updating users