Several changes in User Entity + tokenize register form