diff --git a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
index 360664a4..f3989727 100644
--- a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
+++ b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
@@ -82,6 +82,7 @@ public class ConfigurationServlet extends HttpServlet {
         core.getMuOptions().setAutoPublishSharedFiles(false);
         core.getMuOptions().setDefaultFeedAutoDownload(false);
         core.getMuOptions().setDefaultFeedSequential(false);
+        core.getMuOptions().setAllowTracking(false);
     }
     
     private void update(String name, String value) throws Exception {
@@ -99,6 +100,7 @@ public class ConfigurationServlet extends HttpServlet {
         case "shareHiddenFiles" : core.getMuOptions().setShareHiddenFiles(true); break;
         case "searchComments" : core.getMuOptions().setSearchComments(true); break;
         case "browseFiles" : core.getMuOptions().setBrowseFiles(true); break;
+        case "allowTracking" : core.getMuOptions().setAllowTracking(true); break;
         case "speedSmoothSeconds" : core.getMuOptions().setSpeedSmoothSeconds(Integer.parseInt(value)); break;
         case "inbound.length" : core.getI2pOptions().setProperty(name, value); break;
         case "inbound.quantity" : core.getI2pOptions().setProperty(name, value); break;
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index f24060b6..e9c1d982 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -59,6 +59,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getBrowseFiles()) out.write("checked"); %> name="browseFiles" value="true"></p></td>
 					</tr>
+					<tr>
+						<td>
+							<div class="tooltip"><%=Util._t("Allow tracking")%>
+								<span class="tooltiptext"><%=Util._t("Allow trackers to track your shared files?")%></span>
+							</div>
+						</td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTracking()) out.write("checked"); %> name="allowTracking" value="true"></p></td>
+					</tr>
 				</table>
 			</div>
 			<div class="configuration-section">