final changes in user entity