diff --git a/admin/activate.php b/admin/activate.php
index 89a1fa8733a..90dfca575bc 100644
--- a/admin/activate.php
+++ b/admin/activate.php
@@ -273,9 +273,10 @@
     $presult=db_execute_assoc($pquery);
     while($prow=$presult->FetchRow())
     {
+        if ($createsurvey!='') {$createsurvey .= ",\n";}
         if ($prow['private'] == "N")
         {
-            $createsurvey .= "  token C(36),\n";
+            $createsurvey .= "  token C(36)";
             $surveynotprivate="TRUE";
         }
         if ($prow['allowregister'] == "Y")
@@ -284,12 +285,12 @@
         }
         if ($prow['ipaddr'] == "Y")
         {
-            $createsurvey .= " ipaddr X,\n";
+            $createsurvey .= " ipaddr X";
         }
         //Check to see if 'refurl' field is required.
         if ($prow['refurl'] == "Y")
         {
-            $createsurvey .= " refurl X,\n";
+            $createsurvey .= " refurl X";
         }
     }
     //Get list of questions for the base language