diff --git a/module/Database/src/Form/Address.php b/module/Database/src/Form/Address.php
index 71682afe1..ad28bb2c1 100644
--- a/module/Database/src/Form/Address.php
+++ b/module/Database/src/Form/Address.php
@@ -120,7 +120,7 @@ public function getInputFilterSpecification(): array
                 'validators' => [
                     [
                         'name' => Regex::class,
-                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[1-9]\d*))?$/'],
+                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[0-9]\d*))?$/'],
                     ],
                 ],
             ],
diff --git a/module/Database/src/Form/Fieldset/Address.php b/module/Database/src/Form/Fieldset/Address.php
index e697fea9b..006957fe7 100644
--- a/module/Database/src/Form/Fieldset/Address.php
+++ b/module/Database/src/Form/Fieldset/Address.php
@@ -136,7 +136,7 @@ public function getInputFilterSpecification(): array
                 'validators' => [
                     [
                         'name' => Regex::class,
-                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[1-9]\d*))?$/'],
+                        'options' => ['pattern' => '/^[1-9]\d*(?:[ \/\-\#\.]?(?:[a-zA-Z]+|[0-9]\d*))?$/'],
                     ],
                 ],
             ],