Fixed some logic problems with updating user information