diff --git a/db_structure.xml b/db_structure.xml
index b4c231a9248..77f6d768986 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -2008,13 +2008,22 @@
 
 			<index>
 				<name>admin_sections_id_index</name>
-				<unique>true</unique>
+				<primary>true</primary>
 				<field>
 					<name>id</name>
 					<sorting>ascending</sorting>
 				</field>
 			</index>
 
+			<index>
+				<name>admin_sections_class</name>
+				<unique>true</unique>
+				<field>
+					<name>class</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 	</table>
 
@@ -2060,13 +2069,31 @@
 
 			<index>
 				<name>admin_settings_id_index</name>
-				<unique>true</unique>
+				<primary>true</primary>
 				<field>
 					<name>id</name>
 					<sorting>ascending</sorting>
 				</field>
 			</index>
 
+			<index>
+				<name>admin_settings_class</name>
+				<unique>true</unique>
+				<field>
+					<name>class</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>admin_settings_section</name>
+				<unique>false</unique>
+				<field>
+					<name>section</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 	</table>