diff --git a/epp/src/epp-update.php b/epp/src/epp-update.php
index 9d6813a..c2f5fad 100644
--- a/epp/src/epp-update.php
+++ b/epp/src/epp-update.php
@@ -947,6 +947,13 @@ function processHostUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
     }
 
     if (isset($hostRem)) {
+        $rem_name = $xml->xpath('//host:name[1]')[0];
+
+        if (!validateHostName($rem_name)) {
+            sendEppError($conn, $db, 2005, 'Invalid host:name', $clTRID, $trans);
+            return;
+        }
+
         $addr_list = $xml->xpath('//host:rem/host:addr');
         $status_list = $xml->xpath('//host:rem/host:status/@s');
 
@@ -967,6 +974,13 @@ function processHostUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
     }
 
     if (isset($hostAdd)) {
+        $add_name = $xml->xpath('//host:name[1]')[0];
+
+        if (!validateHostName($add_name)) {
+            sendEppError($conn, $db, 2005, 'Invalid host:name', $clTRID, $trans);
+            return;
+        }
+
         $addr_list = $xml->xpath('//host:add/host:addr');
         $status_list = $xml->xpath('//host:add/host:status/@s');