Fix bug 892026 - Include port in URL if defined