Improve user id detection and nuspec