[HOTFIX] Er, fixes prior hotfix to avoid double-firing on OnRegister