diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index 48c7a0bd..40ea6227 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -1472,7 +1472,8 @@
                         <div class="form-group" id="divAddZoneGlueAddresses">
                             <label for="txtAddZoneGlueAddresses" class="col-sm-4 control-label">Glue Addresses (Optional)</label>
                             <div class="col-sm-7">
-                                <input id="txtAddZoneGlueAddresses" type="text" class="form-control" placeholder="192.168.1.1, 2001:db8::">
+                                <textarea id="txtAddZoneGlueAddresses" class="form-control" rows="3" placeholder="192.168.1.1
+2001:db8::"></textarea>
                             </div>
                         </div>
 
@@ -1606,7 +1607,8 @@
                             <div class="form-group">
                                 <label for="txtAddEditRecordDataNsGlue" class="col-sm-4 control-label">Glue Addresses</label>
                                 <div class="col-sm-7">
-                                    <input id="txtAddEditRecordDataNsGlue" type="text" class="form-control">
+                                    <textarea id="txtAddEditRecordDataNsGlue" class="form-control" rows="3" placeholder="192.168.1.1
+2001:db8::"></textarea>
                                 </div>
                             </div>
                         </div>
@@ -1658,7 +1660,8 @@
                             <div class="form-group">
                                 <label for="txtEditRecordDataSoaGlue" class="col-sm-4 control-label">Glue Addresses</label>
                                 <div class="col-sm-7">
-                                    <input id="txtEditRecordDataSoaGlue" type="text" class="form-control">
+                                    <textarea id="txtEditRecordDataSoaGlue" class="form-control" rows="3" placeholder="192.168.1.1
+2001:db8::"></textarea>
                                 </div>
                             </div>
                         </div>
diff --git a/DnsServerCore/www/js/zone.js b/DnsServerCore/www/js/zone.js
index 715fc4c3..a814b67b 100644
--- a/DnsServerCore/www/js/zone.js
+++ b/DnsServerCore/www/js/zone.js
@@ -285,7 +285,7 @@ function addZone() {
     switch (type) {
         case "Secondary":
         case "Stub":
-            parameters = "&primaryNameServer=" + $("#txtAddZonePrimaryNameServer").val() + "&glueAddresses=" + $("#txtAddZoneGlueAddresses").val();
+            parameters = "&primaryNameServer=" + $("#txtAddZonePrimaryNameServer").val() + "&glueAddresses=" + cleanTextList($("#txtAddZoneGlueAddresses").val());
             break;
 
         case "Forwarder":
@@ -854,7 +854,7 @@ function addRecord() {
                 return;
             }
 
-            var glue = $("#txtAddEditRecordDataNsGlue").val();
+            var glue = cleanTextList($("#txtAddEditRecordDataNsGlue").val());
 
             apiUrl += "&value=" + encodeURIComponent(value) + "&glue=" + encodeURIComponent(glue);
             break;
@@ -1024,7 +1024,7 @@ function showEditRecordModal(objBtn) {
 
         case "NS":
             $("#txtAddEditRecordDataNsNameServer").val(divData.attr("data-record-value"));
-            $("#txtAddEditRecordDataNsGlue").val(divData.attr("data-record-glue"));
+            $("#txtAddEditRecordDataNsGlue").val(divData.attr("data-record-glue").replace(/, /g, "\n"));
 
             if (disableEditRecordModalFields) {
                 $("#txtAddEditRecordName").prop("disabled", true);
@@ -1042,7 +1042,7 @@ function showEditRecordModal(objBtn) {
             $("#txtEditRecordDataSoaRetry").val(divData.attr("data-record-retry"));
             $("#txtEditRecordDataSoaExpire").val(divData.attr("data-record-expire"));
             $("#txtEditRecordDataSoaMinimum").val(divData.attr("data-record-minimum"));
-            $("#txtEditRecordDataSoaGlue").val(divData.attr("data-record-glue"));
+            $("#txtEditRecordDataSoaGlue").val(divData.attr("data-record-glue").replace(/, /g, "\n"));
 
             $("#txtAddEditRecordName").prop("disabled", true);
 
@@ -1186,7 +1186,7 @@ function updateRecord() {
                 return;
             }
 
-            var glue = $("#txtAddEditRecordDataNsGlue").val();
+            var glue = cleanTextList($("#txtAddEditRecordDataNsGlue").val());
 
             apiUrl += "&newValue=" + encodeURIComponent(newValue) + "&glue=" + encodeURIComponent(glue);
             break;
@@ -1241,7 +1241,7 @@ function updateRecord() {
                 return;
             }
 
-            var glue = $("#txtEditRecordDataSoaGlue").val();
+            var glue = cleanTextList($("#txtEditRecordDataSoaGlue").val());
 
             apiUrl += "&primaryNameServer=" + encodeURIComponent(primaryNameServer) +
                 "&responsiblePerson=" + encodeURIComponent(responsiblePerson) +