fixes to support regular registration; got in a bad state when backing out auto-online registration code