Merge pull request #648 from CanineHQ/chriszhu__protect-onboarding-after-setup