Fixed registration, fixed User entity