minor refactoring, no need for extra entity pkg
extend register form validation