diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 12af08e7..453fb849 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>7.14.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml b/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
index 3c837bae..b5320723 100644
--- a/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
+++ b/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
@@ -52,7 +52,7 @@
             </DatePicker.BlackoutDates>
         </DatePicker>
         <ComboBox Name="comboBoxShipSecurityLevel" Grid.Row="5" Grid.Column="1" Margin="2" />
-        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center"/>
+        <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center" PreviewTextInput="textBoxGisisCode_PreviewTextInput"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
         <enictrl:LocodeControl x:Name="locodeGISIS" Grid.Row="8" Grid.Column="1" />
         <TextBox Name="textBoxSecurityMatters" Grid.Row="9" Grid.Column="1" Margin="2" MaxLength="255" />
diff --git a/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs b/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
index a81e7daa..fe1552dc 100644
--- a/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
+++ b/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs
@@ -66,5 +66,10 @@ namespace ENI2.EditControls
         {
             this.CopyValuesToEntity();
         }
+
+        private void textBoxGisisCode_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
+        {
+            e.Handled = !e.Text.IsDigitsOnly();
+        }
     }
 }
diff --git a/bsmd.database/LastTenPortFacilitiesCalled.cs b/bsmd.database/LastTenPortFacilitiesCalled.cs
index 9ca751d2..e810653c 100644
--- a/bsmd.database/LastTenPortFacilitiesCalled.cs
+++ b/bsmd.database/LastTenPortFacilitiesCalled.cs
@@ -193,7 +193,7 @@ namespace bsmd.database
                     errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, null, this.PortFacilityPortLoCode, this.Title, this.Identifier, this.SEC.Tablename));
             }
 
-            if(!this.PortFacilityGISISCode.IsNullOrEmpty() && !this.PortFacilityGISISCode.IsNumber())
+            if(!this.PortFacilityGISISCode.IsNullOrEmpty() && !this.PortFacilityGISISCode.IsDigitsOnly())
             {
                 errors.Add(RuleEngine.CreateError(ValidationCode.INVALID_NUMBER_CHARS, "GISIS Code", this.PortFacilityGISISCode, this.Title, this.Identifier, this.SEC.Tablename));
             }