Updated to handle the userinfo and removed the regex.