Index: src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- src/main/java/com/xpn/xwiki/XWiki.java	(revision 10491)
+++ src/main/java/com/xpn/xwiki/XWiki.java	(working copy)
@@ -4196,9 +4196,9 @@
                     String server = serverobject.getStringValue("server");
                     if (server != null) {
                         int mode = serverobject.getIntValue("secure");
-                        int port = (context.getURL().getPort() == -1) ? 80 : context.getURL().getPort();
+                        int port = context.getURL().getPort();
                         if (mode == 1) {
-                            if (port != 443) {
+                            if (port != -1 && port != 443) {
                                 serverurl = "https://" + server + ":" + port + "/";
                             } else {
                                 serverurl = "https://" + server + "/";
@@ -4204,7 +4204,7 @@
                                 serverurl = "https://" + server + "/";
                             }
                         } else {
-                            if (port != 80) {
+                            if (port!= -1 && port != 80) {
                                 serverurl = "http://" + server + ":" + port + "/";
                             } else {
                                 serverurl = "http://" + server + "/";