diff --git a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
index b7de8c05..b128ce15 100644
--- a/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
+++ b/webui/src/main/java/com/muwire/webui/ConfigurationServlet.java
@@ -33,7 +33,7 @@ public class ConfigurationServlet extends HttpServlet {
     }
     
     private void clearAllBooleans() {
-        core.getMuOptions().setAllowUntrusted(false);
+        core.getMuOptions().setAllowUntrusted(true);
         core.getMuOptions().setSearchExtraHop(false);
         core.getMuOptions().setAllowTrustLists(false);
         core.getMuOptions().setShareDownloadedFiles(false);
@@ -44,7 +44,7 @@ public class ConfigurationServlet extends HttpServlet {
     
     private void update(String name, String value) {
         switch(name) {
-        case "allowUntrusted" : core.getMuOptions().setAllowUntrusted(true); break;
+        case "allowUntrusted" : core.getMuOptions().setAllowUntrusted(false); break;
         case "searchExtraHop" : core.getMuOptions().setSearchExtraHop(true); break;
         case "allowTrustLists": core.getMuOptions().setAllowTrustLists(true); break;
         case "trustListInterval" : core.getMuOptions().setTrustListInterval(Integer.parseInt(value)); break;
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 6e6fd23e..93b58aeb 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -31,11 +31,71 @@ Core core = (Core) application.getAttribute("core");
 				<table>
 					<tr>
 						<td>Search in comments</td>
-						<td><right><input type="checkbox" <% if (core.getMuOptions().getSearchComments()) out.write("checked"); %> name="searchComments" value="true"></right></td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getSearchComments()) out.write("checked"); %> name="searchComments" value="true"></p></td>
 					</tr>
 					<tr>
 						<td>Allow browsing</td>
-						<td><right><input type="checkbox" <% if (core.getMuOptions().getBrowseFiles()) out.write("checked"); %> name="browseFiles" value="true"></right></td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getBrowseFiles()) out.write("checked"); %> name="browseFiles" value="true"></p></td>
+					</tr>
+				</table>
+			</div>
+			<div class="configuration-section">
+				<table>
+					<tr>
+						<td>Retry failed downloads every (seconds)</td>
+						<td><p align="right"><input type="text" size="1" name="downloadRetryInterval" value="<%= core.getMuOptions().getDownloadRetryInterval()%>"></p></td>
+					</tr>
+					<tr>
+						<td>Save downloaded files to</td>
+						<td><p align="right"><input type="text" size="30" name="downloadLocation" value="<%= core.getMuOptions().getDownloadLocation().getAbsoluteFile()%>"></p></td>
+					</tr>
+					<tr> 
+						<td>Store incomplete files in</td>
+						<td><p align="right"><input type="text" size="30" name="incompleteLocation" value="<%= core.getMuOptions().getIncompleteLocation().getAbsoluteFile()%>"></p></td>
+					</tr>
+				</table>
+			</div>
+			<div class="configuration-section">
+				<table>
+					<tr>
+						<td>Total upload slots (-1 means unlimited)</td>
+						<td><p align="right"><input type="text" size="1" name="totalUploadSlots" value="<%= core.getMuOptions().getTotalUploadSlots() %>"></p></td>
+					</tr>
+					<tr>
+						<td>Upload slots per user (-1 means unlimited)</td>
+						<td><p align="right"><input type="text" size="1" name="uploadSlotsPerUser" value="<%= core.getMuOptions().getUploadSlotsPerUser() %>"></p></td>
+					</tr>
+				</table>
+			</div>
+			<div class="configuration-section">
+				<table>
+					<tr>
+						<td>Share downloaded files</td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareDownloadedFiles()) out.write("checked"); %> name="shareDownloadedFiles" value="true"></p></td>
+					</tr>
+					<tr>
+						<td>Share hidden files</td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareHiddenFiles()) out.write("checked"); %> name="shareHiddenFiles" value="true"></p></td>
+					</tr>
+				</table>
+			</div>
+			<div class="configuration-section">
+				<table>
+					<tr>
+						<td>Allow only trusted connections</td>
+						<td><p align="right"><input type="checkbox" <% if (!core.getMuOptions().getAllowUntrusted()) out.write("checked"); %> name="allowUntrusted" value="true"></p></td>
+					</tr>
+					<tr>
+						<td>Search extra hop</td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getSearchExtraHop()) out.write("checked"); %> name="searchExtraHop" value="true"></p></td>
+					</tr>
+					<tr>
+						<td>Allow others to view my trust list</td>
+						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTrustLists()) out.write("checked"); %> name="allowTrustLists" value="true"></p></td>
+					</tr>
+					<tr>
+						<td>Update trust lists every (hours)</td>
+						<td><p align="right"><input type="text" size="1" name="trustListInterval" value="<%= core.getMuOptions().getTrustListInterval() %>"</p></td>
 					</tr>
 				</table>
 			</div>