Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 14364)
+++ /trunk/data/defaultpresets.xml	(revision 14365)
@@ -5980,6 +5980,6 @@
             <space />
             <key key="amenity" value="toilets" />
-            <combo key="access" text="Access rights" values="yes,permissive,customers" />
-            <optional>
+            <optional>
+                <combo key="access" text="Access rights" values="yes,permissive,customers" />
                 <checkgroup columns="3">
                     <check key="female" text="Female" text_context="restroom" />
@@ -5988,5 +5988,4 @@
                 </checkgroup>
                 <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
-                <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
                 <text key="description" text="Description" />
                 <reference ref="fee" />
@@ -5995,4 +5994,5 @@
                 <combo key="diaper" text="Diaper" values="yes,no,room,1,2,3,4,5" text_context="toilets" />
                 <reference ref="wheelchair" />
+                <check key="drinking_water" text="Drinking Water" />
             </optional>
         </item> <!-- Toilets/Restrooms -->