diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index 717f15d8..8869efc5 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -127,8 +127,8 @@
                                                         <li class="list-group-item resource-record">
                                                             <form class="form-inline">
                                                                 <div class="form-group">
-                                                                    <label for="optType">Type</label>
-                                                                    <select class="form-control" id="optType" disabled>
+                                                                    <label for="optType1">Type</label>
+                                                                    <select class="form-control" id="optType1" disabled>
                                                                         <option>A</option>
                                                                         <option>NS</option>
                                                                         <option>CNAME</option>
@@ -140,16 +140,16 @@
                                                                     </select>
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Name</label>
-                                                                    <input type="text" class="form-control" id="addRRSubDomain" placeholder="@" style="width: 136px;">
+                                                                    <label for="addRRSubDomain1">Name</label>
+                                                                    <input type="text" class="form-control" id="addRRSubDomain1" placeholder="@" style="width: 136px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Value</label>
-                                                                    <input type="text" class="form-control" id="addRRValue" placeholder="value" style="width: 250px;">
+                                                                    <label for="addRRValue1">Value</label>
+                                                                    <input type="text" class="form-control" id="addRRValue1" placeholder="value" style="width: 250px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRTtl">TTL</label>
-                                                                    <input type="number" class="form-control" id="addRRTtl" placeholder="3600" style="width: 80px;">
+                                                                    <label for="addRRTtl1">TTL</label>
+                                                                    <input type="number" class="form-control" id="addRRTtl1" placeholder="3600" style="width: 80px;">
                                                                 </div>
 
                                                                 <div class="form-group" style="display: block; margin-bottom: 0px;">
@@ -162,8 +162,8 @@
                                                         <li class="list-group-item resource-record">
                                                             <form class="form-inline">
                                                                 <div class="form-group">
-                                                                    <label for="optType">Type</label>
-                                                                    <select class="form-control" id="optType" disabled>
+                                                                    <label for="optType2">Type</label>
+                                                                    <select class="form-control" id="optType2" disabled>
                                                                         <option>A</option>
                                                                         <option>NS</option>
                                                                         <option>CNAME</option>
@@ -175,40 +175,40 @@
                                                                     </select>
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Name</label>
-                                                                    <input type="text" class="form-control" id="addRRSubDomain" placeholder="@" style="width: 136px;">
+                                                                    <label for="addRRSubDomain2">Name</label>
+                                                                    <input type="text" class="form-control" id="addRRSubDomain2" placeholder="@" style="width: 136px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Master Name Server</label>
-                                                                    <input type="text" class="form-control" id="addRRValue" placeholder="value" style="width: 250px;">
+                                                                    <label for="addRRValue2">Master Name Server</label>
+                                                                    <input type="text" class="form-control" id="addRRValue2" placeholder="value" style="width: 250px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Responsible Person</label>
-                                                                    <input type="text" class="form-control" id="addRRValue" placeholder="value" style="width: 200px;">
+                                                                    <label for="addRRValueRP">Responsible Person</label>
+                                                                    <input type="text" class="form-control" id="addRRValueRP" placeholder="value" style="width: 200px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Serial</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="value" style="width: 100px;">
+                                                                    <label for="addRRValueSerial">Serial</label>
+                                                                    <input type="number" class="form-control" id="addRRValueSerial" placeholder="value" style="width: 100px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Refresh</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="value" style="width: 80px;">
+                                                                    <label for="addRRValueRefresh">Refresh</label>
+                                                                    <input type="number" class="form-control" id="addRRValueRefresh" placeholder="value" style="width: 80px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Retry</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="value" style="width: 80px;">
+                                                                    <label for="addRRValueRetry">Retry</label>
+                                                                    <input type="number" class="form-control" id="addRRValueRetry" placeholder="value" style="width: 80px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Expire</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="value" style="width: 80px;">
+                                                                    <label for="addRRValueExpire">Expire</label>
+                                                                    <input type="number" class="form-control" id="addRRValueExpire" placeholder="value" style="width: 80px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Minimum</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="value" style="width: 80px;">
+                                                                    <label for="addRRValueMinimum">Minimum</label>
+                                                                    <input type="number" class="form-control" id="addRRValueMinimum" placeholder="value" style="width: 80px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRTtl">TTL</label>
-                                                                    <input type="number" class="form-control" id="addRRTtl" placeholder="3600" style="width: 80px;">
+                                                                    <label for="addRRTtl2">TTL</label>
+                                                                    <input type="number" class="form-control" id="addRRTtl2" placeholder="3600" style="width: 80px;">
                                                                 </div>
 
                                                                 <div class="form-group" style="display: block; margin-bottom: 0px;">
@@ -221,8 +221,8 @@
                                                         <li class="list-group-item resource-record">
                                                             <form class="form-inline">
                                                                 <div class="form-group">
-                                                                    <label for="optType">Type</label>
-                                                                    <select class="form-control" id="optType" disabled>
+                                                                    <label for="optType3">Type</label>
+                                                                    <select class="form-control" id="optType3" disabled>
                                                                         <option>A</option>
                                                                         <option>NS</option>
                                                                         <option>CNAME</option>
@@ -234,20 +234,20 @@
                                                                     </select>
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Name</label>
-                                                                    <input type="text" class="form-control" id="addRRSubDomain" placeholder="@" style="width: 136px;">
+                                                                    <label for="addRRSubDomain3">Name</label>
+                                                                    <input type="text" class="form-control" id="addRRSubDomain3" placeholder="@" style="width: 136px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Exchange</label>
-                                                                    <input type="text" class="form-control" id="addRRValue" placeholder="mx1.example.com" style="width: 250px;">
+                                                                    <label for="addRRValue3">Exchange</label>
+                                                                    <input type="text" class="form-control" id="addRRValue3" placeholder="mx1.example.com" style="width: 250px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRSubDomain">Preference</label>
-                                                                    <input type="number" class="form-control" id="addRRValue" placeholder="10" style="width: 80px;">
+                                                                    <label for="addRRValuePref">Preference</label>
+                                                                    <input type="number" class="form-control" id="addRRValuePref" placeholder="10" style="width: 80px;">
                                                                 </div>
                                                                 <div class="form-group">
-                                                                    <label for="addRRTtl">TTL</label>
-                                                                    <input type="number" class="form-control" id="addRRTtl" placeholder="3600" style="width: 80px;">
+                                                                    <label for="addRRTtl3">TTL</label>
+                                                                    <input type="number" class="form-control" id="addRRTtl3" placeholder="3600" style="width: 80px;">
                                                                 </div>
 
                                                                 <div class="form-group" style="display: block; margin-bottom: 0px;">
@@ -534,16 +534,16 @@
     </div>
 
     <div id="modalChangePassword" class="modal fade" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">Change Password</h4>
-                </div>
-                <div class="modal-body">
-                    <div id="divChangePasswordAlert"></div>
+        <form class="form-horizontal">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title">Change Password</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div id="divChangePasswordAlert"></div>
 
-                    <form class="form-horizontal" onsubmit="return false;">
                         <div class="form-group">
                             <label for="txtChangePasswordUsername" class="col-sm-4 control-label">Username</label>
                             <div class="col-sm-7">
@@ -564,14 +564,14 @@
                                 <input id="txtChangePasswordConfirmPassword" type="password" class="form-control" placeholder="confirm password">
                             </div>
                         </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    <button id="btnChangePasswordSave" type="button" class="btn btn-primary" data-loading-text="Saving..." onclick="return changePassword();">Save</button>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button id="btnChangePasswordSave" type="submit" class="btn btn-primary" data-loading-text="Saving..." onclick="return changePassword();">Save</button>
+                    </div>
                 </div>
             </div>
-        </div>
+        </form>
     </div>
 
     <div id="footer"></div>
diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index c3de4bb1..bece48d9 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -99,6 +99,10 @@ function login(username, password) {
             token = responseJSON.token;
 
             showPageMain(username);
+
+            if ((username === "admin") && (password === "admin")) {
+                $('#modalChangePassword').modal();
+            }
         },
         error: function () {
             btn.button('reset');
@@ -506,6 +510,7 @@ function addZone() {
         url: "/api/createZone?token=" + token + "&domain=" + domain,
         success: function (responseJSON) {
             refreshZonesList();
+            viewZone(domain, false);
 
             $("#txtAddZone").val("");
             btn.button('reset');