Fix bug and refactor register birth abroad