Fix issue with registration state entity checking by using entity condition instead of entity property condition. Also do not reconcile accounts until registration is updated, not new. There may be some issues with that as well, but hopefully not.