Fix for issue with commas in User Name due to escaping.