diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
index c5f4908..31baef5 100644
--- a/cp/app/Controllers/DomainsController.php
+++ b/cp/app/Controllers/DomainsController.php
@@ -976,6 +976,9 @@ class DomainsController extends Controller
                     WHERE dcm.domain_id = ?';
                 $domainContacts = $db->select($domainContactsQuery, [$domain['id']]);
 
+                if (strpos($domain['name'], 'xn--') === 0) {
+                    $domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                }
                 return view($response,'admin/domains/viewDomain.twig', [
                     'domain' => $domain,
                     'domainStatus' => $domainStatus,
@@ -1064,6 +1067,9 @@ class DomainsController extends Controller
                 $csrfTokenName = $this->container->get('csrf')->getTokenName();
                 $csrfTokenValue = $this->container->get('csrf')->getTokenValue();
 
+                if (strpos($domain['name'], 'xn--') === 0) {
+                    $domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                }
                 return view($response,'admin/domains/updateDomain.twig', [
                     'domain' => $domain,
                     'domainStatus' => $domainStatus,
@@ -1889,6 +1895,10 @@ class DomainsController extends Controller
                 // Determine currency position (before or after)
                 $position = (strpos($pattern, '¤') < strpos($pattern, '#')) ? 'before' : 'after';
 
+                if (strpos($domain['name'], 'xn--') === 0) {
+                    $domain['punycode'] = $domain['name'];
+                    $domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                }
                 return view($response,'admin/domains/renewDomain.twig', [
                     'domain' => $domain,
                     'domainStatus' => $domainStatus,
diff --git a/cp/app/Controllers/HostsController.php b/cp/app/Controllers/HostsController.php
index 0598c78..b390ca2 100644
--- a/cp/app/Controllers/HostsController.php
+++ b/cp/app/Controllers/HostsController.php
@@ -288,6 +288,9 @@ class HostsController extends Controller
                 $hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'",
                 [ $host['id'] ]);
                 
+                if (strpos($host['name'], 'xn--') === 0) {
+                    $host['name'] = idn_to_utf8($host['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                }
                 return view($response,'admin/hosts/viewHost.twig', [
                     'host' => $host,
                     'hostStatus' => $hostStatus,
@@ -382,6 +385,9 @@ class HostsController extends Controller
                     $hostIPv6 = $db->select("SELECT addr FROM host_addr WHERE host_id = ? AND ip = 'v6'",
                     [ $host['id'] ]);
 
+                    if (strpos($host['name'], 'xn--') === 0) {
+                        $host['name'] = idn_to_utf8($host['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                    }
                     return view($response,'admin/hosts/updateHost.twig', [
                         'host' => $host,
                         'hostIPv4' => $hostIPv4,
diff --git a/cp/resources/views/admin/domains/renewDomain.twig b/cp/resources/views/admin/domains/renewDomain.twig
index 16a67e8..09b02db 100644
--- a/cp/resources/views/admin/domains/renewDomain.twig
+++ b/cp/resources/views/admin/domains/renewDomain.twig
@@ -31,7 +31,7 @@
                         {{ csrf.field | raw }}{% endif %}
                             <div class="mb-3">
                                 <label for="domainName" class="form-label">{{ __('Domain Name') }}</label>
-                                <div class="form-control-plaintext">{{ domain.name }}</div><input type="hidden" name="domainName" id="domainName" value="{{ domain.name }}">
+                                <div class="form-control-plaintext">{{ domain.name }}</div><input type="hidden" name="domainName" id="domainName" value="{{ domain.punycode }}">
                             </div>
                             
                             {% if maxYears >= 1 %}