diff --git a/edit-master.php b/edit-master.php
index 5bbf729..e967659 100644
--- a/edit-master.php
+++ b/edit-master.php
@@ -150,7 +150,12 @@ limitations under the License.
                     </tbody>
                     <tfoot>
                         <td>New</td>
-                        <td><input id="addName" type="text" class="form-control input-sm" data-regex="^([^.]+\.)*[^.]+$"></td>
+                        <td>
+                            <div class="input-group">
+                                <input id="addName" type="text" class="form-control input-sm" data-regex="^([^.]+\.)*[^.]*$">
+                                <span class="input-group-addon" id="add-domain-name"></span>
+                            </div>
+                        </td>
                         <td><select id="addType" class="form-control select-narrow-70"></select></td>
                         <td><input id="addContent" type="text" class="form-control input-sm" data-regex="^.+$"></td>
                         <td><input id="addPrio" type="text" class="form-control input-sm" size="1" data-regex="^[0-9]+$"></td>
diff --git a/js/edit-master.js b/js/edit-master.js
index 64d0f37..146dac2 100644
--- a/js/edit-master.js
+++ b/js/edit-master.js
@@ -81,8 +81,6 @@ $(document).ready(function() {
         requestRecordData();
     });
     
-    $('#addButton').click(addRecord);
-    
     requestRecordData();
     requestSoaData();
     requestSerial();
@@ -231,9 +229,13 @@ function editClicked() {
     var tableCells = $(this).parent().parent().children('td');
     var tableRow = $(this).parent().parent();
     
+    var valueExtractRegex = new RegExp('\.?' + domainName + "$");
     var valueName = tableCells.eq(1).text();
+    valueName = valueName.replace(valueExtractRegex, "");
     tableCells.eq(1).empty();
-    $('<input type="text" class="form-control input-sm">').appendTo(tableCells.eq(1)).val(valueName);
+    var inputGroupName = $('<div class="input-group"></div>').appendTo(tableCells.eq(1));
+    $('<input type="text" class="form-control input-sm">').appendTo(inputGroupName).val(valueName);
+    $('<span class="input-group-addon"></span>').appendTo(inputGroupName).text("." + domainName);
     
     var valueType = tableCells.eq(2).text();
     tableCells.eq(2).empty();
@@ -270,7 +272,7 @@ function saveRecord() {
     
     var data = {
         id: tableRow.children('td').eq(0).text(),
-        name: tableRow.children('td').eq(1).children('input').val(),
+        name: tableRow.children('td').eq(1).find('input').val(),
         type: tableRow.children('td').eq(2).children('select').val(),
         content: tableRow.children('td').eq(3).children('input').val(),
         prio: tableRow.children('td').eq(4).children('input').val(),
@@ -280,6 +282,12 @@ function saveRecord() {
         csrfToken: $('#csrfToken').text()
     };
     
+    if(data.name.length > 0) {
+        data.name = data.name + "." + domainName;
+    } else {
+        data.name = domainName;
+    }
+    
     tableRow.children('td').eq(0).empty().text(data.id);
     tableRow.children('td').eq(1).empty().text(data.name);
     tableRow.children('td').eq(2).empty().text(data.type);
@@ -314,7 +322,6 @@ function addRecord() {
     }
     
     var data = {
-        name: $('#addName').val(),
         type: $('#addType').val(),
         content: $('#addContent').val(),
         prio: $('#addPrio').val(),
@@ -324,6 +331,12 @@ function addRecord() {
         csrfToken: $('#csrfToken').text()
     };
     
+    if($('#addName').val().length > 0) {
+        data.name = $('#addName').val() + "." + domainName;
+    } else {
+        data.name = domainName;
+    }
+    
     $.post(
         "api/edit-master.php",
         JSON.stringify(data),
@@ -387,7 +400,9 @@ function requestDomainName() {
         JSON.stringify(data),
         function(data) {
             $('#domain-name').text(data.name);
+            $('#add-domain-name').text("." + data.name);
             domainName = data.name;
+            $('#addButton').unbind().click(addRecord);
         },
         "json"
     );