refactored user identity to have a separate identifier