diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php
index 405fcf488..97a9c9b77 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php
@@ -67,7 +67,11 @@ class NetworkField extends BaseField
      */
     public function setNetMaskRequired($value)
     {
-        $this->internalNetMaskRequired = (trim(strtolower($value)) == 'y' || intval($value) == 1);
+        if (trim(strtoupper($value)) == "Y") {
+            $this->internalNetMaskRequired = true;
+        } else {
+            $this->internalNetMaskRequired = false;
+        }
     }
 
     /**
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
index 57d102319..4b47b0fea 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
@@ -102,8 +102,7 @@ class NetworkValidator extends Validator implements ValidatorInterface
                     }
                 }
             }
-        }
-        else if($this->getOption('netMaskRequired') === true) {
+        } elseif ($this->getOption('netMaskRequired') === true) {
             $result = false;
         }