minor: improved initial loading time, changed check_registration handling
Authored by: kellgeor 2018-11-30
Parent: [r332]
Child: [r334]