updated registration to handle pre-existing orgs. #330 tentatively working