#40 registration improvement with new user entity