diff --git a/include/data_upload b/include/data_upload
index 371248fd..e162a936 100644
--- a/include/data_upload
+++ b/include/data_upload
@@ -22,17 +22,13 @@
 PROGRAM_VERSION="101"
 
     # Data upload destination
-    if [ "${UPLOAD_SERVER}" = "" ]; then
-        UPLOAD_SERVER="cisofy.com"
-    fi
+    if [ "${UPLOAD_SERVER}" = "" ]; then; UPLOAD_SERVER="portal.cisofy.com"; fi
     UPLOAD_URL="https://${UPLOAD_SERVER}/upload/"
     LogText "Upload server: ${UPLOAD_SERVER}"
     LogText "URL to upload to: ${UPLOAD_URL}"
 
     # License server (set to upload server if not configured)
-    if [ "${LICENSE_SERVER}" = "" ]; then
-        LICENSE_SERVER="${UPLOAD_SERVER}"
-    fi
+    if [ "${LICENSE_SERVER}" = "" ]; then LICENSE_SERVER="${UPLOAD_SERVER}"; fi
     LICENSE_SERVER_URL="https://${LICENSE_SERVER}/license/"
     LogText "License server: ${LICENSE_SERVER}"
 
@@ -40,7 +36,7 @@ PROGRAM_VERSION="101"
 if [ "${UPLOAD_OPTIONS}" = "" ]; then
     CURL_OPTIONS=""
   else
-    CURL_OPTIONS="${UPLOAD_OPTIONS}"
+    CURL_OPTIONS=" ${UPLOAD_OPTIONS}"
 fi
 SETTINGS_FILE="${PROFILE}"