diff --git a/htroot/CrawlStartExpert.html b/htroot/CrawlStartExpert.html
index 5760f1455..a68125815 100644
--- a/htroot/CrawlStartExpert.html
+++ b/htroot/CrawlStartExpert.html
@@ -515,7 +515,7 @@
         <fieldset>
           <legend>Index Administration</legend>
           <dl>
-          <dt>Do Local Indexing</dt>
+          <dt>Indexing</dt>
           <dd>
             <span class="info" style="float:right"><img src="env/grafics/i16.gif" width="16" height="16" alt="info"/><span style="right:0px;">
             This enables indexing of the webpages the crawler will download. This should be switched on by default, unless you want to crawl only to fill the
@@ -526,7 +526,7 @@
             <label for="indexMedia">index media</label>:
             <input type="checkbox" name="indexMedia" id="indexMedia" #(indexingMediaChecked)#::checked="checked"#(/indexingMediaChecked)# />
           </dd>
-
+          #(remoteindexing)#::
           <dt><label for="crawlOrder">Do Remote Indexing</label></dt>
           <dd>
             <span class="info" style="float:right"><img src="env/grafics/i16.gif" width="16" height="16" alt="info"/><span style="right:0px;">
@@ -549,6 +549,7 @@
               </tr>
             </table>
           </dd>
+          #(/remoteindexing)#
 
           <dt><label for="collection">Add Crawl result to collection(s)</label></dt>
           <dd>
diff --git a/htroot/CrawlStartExpert.java b/htroot/CrawlStartExpert.java
index e763b335c..9d4c0ae49 100644
--- a/htroot/CrawlStartExpert.java
+++ b/htroot/CrawlStartExpert.java
@@ -554,18 +554,25 @@ public class CrawlStartExpert {
             prop.put("indexingMediaChecked",
                     env.getConfigBool("indexMedia", true) ? 1 : 0);
             // Do Remote Indexing?
-            prop.put("crawlOrderChecked",
-                    env.getConfigBool("crawlOrder", true) ? 1 : 0);
-            // Remote crawl intention
-            prop.put("intention", "");
+            if (sb.isP2PMode()) {
+                prop.put("remoteindexing", 1);
+                prop.put("remoteindexing_crawlOrderChecked", env.getConfigBool("crawlOrder", true) ? 1 : 0);
+                prop.put("remoteindexing_intention", "");
+            } else {
+                prop.put("remoteindexing", 0);
+            }
         } else {
             prop.put("indexingTextChecked",
                     post.getBoolean("indexText") ? 1 : 0);
             prop.put("indexingMediaChecked",
                     post.getBoolean("indexMedia") ? 1 : 0);
-            prop.put("crawlOrderChecked",
-                    post.getBoolean("crawlOrder") ? 1 : 0);
-            prop.put("intention", post.get("intention", ""));
+            if (sb.isP2PMode()) {
+                prop.put("remoteindexing", 1);
+                prop.put("remoteindexing_crawlOrderChecked", post.getBoolean("crawlOrder") ? 1 : 0);
+                prop.put("remoteindexing_intention", post.get("intention", ""));
+            } else {
+                prop.put("remoteindexing", 0);
+            }
         }
 
         // Target collection