diff --git a/src/conf/manager.xml b/src/conf/manager.xml
index 9083e6a..52c9228 100644
--- a/src/conf/manager.xml
+++ b/src/conf/manager.xml
@@ -55,10 +55,10 @@
             <idle>1800000</idle>
         </client>
         <socket>
-            <plain>
+            <default>
                 <!-- Default port to use for plain/TLS client connections. -->
                 <port>5222</port>
-            </plain>
+            </default>
             <ssl>
                 <active>true</active>
                 <!-- Default port to use for client connections using old SSL method. -->
diff --git a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
index 4ddc0b7..7ff9fe7 100644
--- a/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
+++ b/src/java/org/jivesoftware/multiplexer/ConnectionManager.java
@@ -251,7 +251,15 @@
 
     private void startClientListeners(String localIPAddress) {
         // Start clients plain socket unless it's been disabled.
-        int port = JiveGlobals.getIntProperty("xmpp.socket.plain.port", 5222);
+        int port = 5222;
+        // Check if old property is being used for storing c2s port
+        if (JiveGlobals.getXMLProperty("xmpp.socket.plain.port") != null) {
+            port = JiveGlobals.getIntProperty("xmpp.socket.plain.port", 5222);
+        }
+        // Check if new property is being used for storing c2s port
+        else if (JiveGlobals.getXMLProperty("xmpp.socket.default.port") != null) {
+            port = JiveGlobals.getIntProperty("xmpp.socket.default.port", 5222);
+        }
         ServerPort serverPort = new ServerPort(port, serverName, localIPAddress,
                 false, null, ServerPort.Type.client);
         try {