diff --git a/backend/public/index.html b/backend/public/index.html
index b615a11..e3d6b4e 100644
--- a/backend/public/index.html
+++ b/backend/public/index.html
@@ -762,7 +762,17 @@ document.getElementById("dns-"+d.id).innerHTML=status
 const mapRes = await fetch(API+"/domainmap")
 const mappings = await mapRes.json()
 
-const server = mappings.find(m=>m.ip_address==result.ips[0])
+const dnsIP = result.ips ? result.ips[0] : null
+
+let server = mappings.find(m=>m.ip_address==d.ip_address)
+
+if(!server && dnsIP){
+server = mappings.find(m=>m.ip_address==dnsIP)
+}
+
+if(server){
+document.getElementById("server-"+d.id).innerHTML=server.server_name
+}
 
 if(server){
 document.getElementById("server-"+d.id).innerHTML=server.server_name
@@ -827,12 +837,18 @@ async function saveDomain(){
 
 const id=document.getElementById("domain_id").value
 
+let cost=document.getElementById("domain_cost").value
+
+if(cost){
+cost=cost.replace(",",".")
+}
+
 const data={
 
 domain_name:document.getElementById("domain_name").value,
 provider:document.getElementById("domain_provider").value,
 ip_address:document.getElementById("domain_ip").value,
-yearly_cost:document.getElementById("domain_cost").value || null,
+yearly_cost:cost || null,
 notes:document.getElementById("domain_notes").value
 
 }