diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 317d7051c..0e7e838a6 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -68,7 +68,7 @@
 	    </div>
 	    <h3><%=servername%></h3>
 	    <div class="cbi-section-node" id="cbi-omr-wizard-<%=servername%>">
-		<div class="cbi-value" id="<%=servername%>.server_ip" data-depends="[{&#34;enableipv6&#34;:&#34;1&#34;}]">
+		<div class="cbi-value" id="<%=servername%>.server_ip" data-depends="[{&#34;enableipv6&#34;:&#34;1&#34;}]" data-index="1">
 		    <label class="cbi-value-title" for="server_ip.1"><%:Server IP%></label>
 		    <div class="cbi-value-field">
 			    <input name="<%=servername%>.serverip.ip1" id="<%=servername%>.server_ip.1" placeholder="<%:Server IP%>" class="cbi-input-text" value="<%=uci:get_list("openmptcprouter",servername,"ip")[1]%>" data-optional="false">
@@ -77,7 +77,7 @@
 			</div>
 		    </div>
 		</div>
-		<div class="cbi-value" id="<%=servername%>.server_ipv6" data-depends="[{&#34;enableipv6&#34;:&#34;0&#34;}]">
+		<div class="cbi-value" id="<%=servername%>.server_ipv6" data-depends="[{&#34;enableipv6&#34;:&#34;0&#34;}]" data-index="1">
 		    <label class="cbi-value-title" for="server_ip.1"><%:Server IP%></label>
 		    <div class="cbi-value-field">
 			    <input name="<%=servername%>.serverip.ip1" id="<%=servername%>.server_ip.1" placeholder="<%:Primary server IP%>" class="cbi-input-text" value="<%=uci:get_list("openmptcprouter",servername,"ip")[1]%>" data-optional="false">
@@ -86,12 +86,12 @@
 			    <%:Server IP will be set for proxy and VPN%>
 			</div>
 			<div class="cbi-value-description">
-			    <%:A secondary server IP can be set for dual IPv4/IPv6 server contact if WAN IPv6 are set%>
+			    <%:A second server's IP can be set for dual IPv4/IPv6 server if WAN IPv6 are set%>
 			</div>
 		    </div>
 		</div>
 		<br />
-		<div class="cbi-value">
+		<div class="cbi-value" data-index="2">
 		    <label class="cbi-value-title"><%:Server username%></label>
 		    <div class="cbi-value-field">
 			<input type="text" name="<%=servername%>.openmptcprouter_vps_username" placeholder="<%:Server username%>" class="cbi-input-text" value="<%=uci:get("openmptcprouter",servername,"username")%>" data-optional="false">
@@ -101,7 +101,7 @@
 			</div>
 		    </div>
 		</div>
-		<div class="cbi-value">
+		<div class="cbi-value" data-index="3">
 		    <label class="cbi-value-title"><%:Server key%></label>
 		    <div class="cbi-value-field">
 			<input type="text" name="<%=servername%>.openmptcprouter_vps_key" placeholder="<%:Server key%>" class="cbi-input-text" value="<%=uci:get("openmptcprouter",servername,"password")%>" data-optional="false">
@@ -115,7 +115,7 @@
 		    if nbserver > 1 then
 		%>
 		<br />
-		<div class="cbi-value">
+		<div class="cbi-value" data-index="4">
 		    <label class="cbi-value-title"><%:Set server as master%></label>
 		    <div class="cbi-value-field">
 			<input class="cbi-input-radio" type="radio" name="master" value="<%=servername%>" <% if uci:get("openmptcprouter",servername,"master") == "1" then %>checked<% end %>/>
@@ -129,7 +129,7 @@
 		    end
 	    %>
 		<br />
-		<div class="cbi-value">
+		<div class="cbi-value" data-index="5">
 		    <label class="cbi-value-title"><%:Disable server%></label>
 		    <div class="cbi-value-field">
 			<input class="cbi-input-radio" type="checkbox" name="<%=servername%>.openmptcprouter_vps_disabled" value="1" <% if uci:get("openmptcprouter",servername,"disabled") == "1" then %>checked<% end %>/>