Fix bugs self.current_user
Finish updating users