diff --git a/cp/app/Controllers/ContactsController.php b/cp/app/Controllers/ContactsController.php
index 0698164..b72b237 100644
--- a/cp/app/Controllers/ContactsController.php
+++ b/cp/app/Controllers/ContactsController.php
@@ -135,7 +135,7 @@ class ContactsController extends Controller
                     }
                 }
 
-                if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoIntCity)) {
+                if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\'\s]{2,}$/i', $postalInfoIntCity)) {
                     $this->container->get('flash')->addMessage('error', 'Unable to create contact: Invalid contact city');
                     return $response->withHeader('Location', '/contact/create')->withStatus(302);
                 }
@@ -880,7 +880,7 @@ class ContactsController extends Controller
                     }
                 }
 
-                if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoIntCity)) {
+                if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\'\s]{2,}$/i', $postalInfoIntCity)) {
                     $this->container->get('flash')->addMessage('error', 'Unable to update contact: Invalid contact city');
                     return $response->withHeader('Location', '/contact/update/'.$identifier)->withStatus(302);
                 }
diff --git a/epp/src/epp-create.php b/epp/src/epp-create.php
index b4757d6..058b52d 100644
--- a/epp/src/epp-create.php
+++ b/epp/src/epp-create.php
@@ -102,7 +102,7 @@ function processContactCreate($conn, $db, $xml, $clid, $database_type, $trans) {
             }
         }
 
-        if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoIntCity)) {
+        if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\'\s]{2,}$/i', $postalInfoIntCity)) {
             sendEppError($conn, $db, 2005, 'Invalid contact:city', $clTRID, $trans);
             return;
         }
diff --git a/epp/src/epp-update.php b/epp/src/epp-update.php
index 4b582ec..5b7e19e 100644
--- a/epp/src/epp-update.php
+++ b/epp/src/epp-update.php
@@ -187,7 +187,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type, $trans) {
                 }
             }
 
-            if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoIntCity)) {
+            if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\'\s]{2,}$/i', $postalInfoIntCity)) {
                 sendEppError($conn, $db, 2005, 'Invalid contact:city', $clTRID, $trans);
                 return;
             }