Improved registration validation/error showing logic to match beta signup code