diff --git a/bin/CreateServer b/bin/CreateServer
index 516a80b..93f9299 100755
--- a/bin/CreateServer
+++ b/bin/CreateServer
@@ -71,16 +71,16 @@ then
     exit
 fi
 
-if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port ]
+if [ -d /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port ]
 then
     echo "CreateServer: Account directory exists!  Exiting."
     echo "$(date) $(hostname) CreateServer: Account directory exists!  Exiting." >> $srv_log
     if [ "$callback_url" ]; then $cback "$callback_url&do=createsrv_status&status=failed" >> /dev/null; fi
     exit
 else
-    echo "$(date) $(hostname) CreateServer: Creating server directory /usr/local/gpx/users/$srv_username/$srv_ip:$srv_port ..." >> $srv_log
-    mkdir -p /usr/local/gpx/users/$srv_username/$srv_ip\:$srv_port
-    gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip:$srv_port
+    echo "$(date) $(hostname) CreateServer: Creating server directory /usr/local/gpx/users/$srv_username/$srv_ip-$srv_port ..." >> $srv_log
+    mkdir -p /usr/local/gpx/users/$srv_username/$srv_ip\-$srv_port
+    gpxdir=/usr/local/gpx/users/$srv_username/$srv_ip-$srv_port
 fi
 
 echo "$(date) $(hostname) CreateServer: Extracting TPL ($tpl_id) to $gpxdir ..." >> $srv_log