Fix bugs in current_user assignment
Comment for my understanding
Finish updating users