diff --git a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
index fdb65659..defe9f40 100644
--- a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
@@ -75,7 +75,7 @@
                                 <DataGridTextColumn.Binding>
                                     <Binding Path="BunkerFuelType" Mode="TwoWay">
                                         <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="100" />
+                                            <util:StringValidationRule MaxLength="25" />
                                         </Binding.ValidationRules>
                                     </Binding>
                                 </DataGridTextColumn.Binding>
diff --git a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
index aff5d676..c32ba2c9 100644
--- a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
@@ -74,7 +74,7 @@
                                 <DataGridTextColumn.Binding>
                                     <Binding Path="BunkerFuelType" Mode="TwoWay">
                                         <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="100" />
+                                            <util:StringValidationRule MaxLength="25" />
                                         </Binding.ValidationRules>
                                     </Binding>
                                 </DataGridTextColumn.Binding>
diff --git a/ENI2/EditControls/EditBKRDialog.xaml b/ENI2/EditControls/EditBKRDialog.xaml
index 5fc4bddc..ed65bcf4 100644
--- a/ENI2/EditControls/EditBKRDialog.xaml
+++ b/ENI2/EditControls/EditBKRDialog.xaml
@@ -19,7 +19,7 @@
             <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
         <Label Content="{x:Static p:Resources.textBunkerType}" Grid.Row="0" Grid.Column="0" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="25" VerticalContentAlignment="Center"/>
         <Label Content="{x:Static p:Resources.textBunkerQuantity}" Grid.Row="1" Grid.Column="0" />
         <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownBunkerQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" TextAlignment="Left" />
     </Grid>
diff --git a/bsmd.database/BKRA.cs b/bsmd.database/BKRA.cs
index b6ed9494..063f21fa 100644
--- a/bsmd.database/BKRA.cs
+++ b/bsmd.database/BKRA.cs
@@ -31,7 +31,7 @@ namespace bsmd.database
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
-        [MaxLength(100)]
+        [MaxLength(25)]
         [ENI2Validation]
         public string BunkerFuelType { get; set; }
 
diff --git a/bsmd.database/BRKD.cs b/bsmd.database/BRKD.cs
index 80ea0278..487bce7b 100644
--- a/bsmd.database/BRKD.cs
+++ b/bsmd.database/BRKD.cs
@@ -31,7 +31,7 @@ namespace bsmd.database
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
-        [MaxLength(100)]
+        [MaxLength(25)]
         [ENI2Validation]
         public string BunkerFuelType { get; set; }