Tweak registration open/close behavior, fix #84