diff --git a/src/BreCalClient/EditShipDialog.xaml b/src/BreCalClient/EditShipDialog.xaml
index c28df84..a7d3d64 100644
--- a/src/BreCalClient/EditShipDialog.xaml
+++ b/src/BreCalClient/EditShipDialog.xaml
@@ -25,7 +25,7 @@
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
         <Label Content="Name" HorizontalAlignment="Right" />
-        <TextBox x:Name="textBoxName" Grid.Column="1" Margin="2" VerticalContentAlignment="Center" Text="{Binding Name, Mode=OneWay}" />
+        <TextBox x:Name="textBoxName" Grid.Column="1" Margin="2" VerticalContentAlignment="Center" Text="{Binding Name, Mode=OneWay}" TextChanged="textBoxName_TextChanged" MaxLength="64"/>
         <Label Content="{x:Static p:Resources.textTugCompany}" HorizontalAlignment="Right" Grid.Row="1" />
         <Grid Grid.Row="1" Grid.Column="1">
             <Grid.ColumnDefinitions>
@@ -38,9 +38,9 @@
             </Button>
         </Grid>
         <Label Content="IMO" HorizontalAlignment="Right" Grid.Row="2" />
-        <xctk:IntegerUpDown Name="integerUpDownIMO" Grid.Column="1" Grid.Row="2" Value="{Binding Imo, Mode=OneWay}" Margin="2" Minimum="1000000" Maximum="9999999" ShowButtonSpinner="False"/>
+        <xctk:IntegerUpDown Name="integerUpDownIMO" Grid.Column="1" Grid.Row="2" Value="{Binding Imo, Mode=OneWay}" Margin="2" Minimum="1000000" Maximum="9999999" ShowButtonSpinner="False" ValueChanged="integerUpDownIMO_ValueChanged"/>
         <Label Content="{x:Static p:Resources.textCallsign}" HorizontalAlignment="Right" Grid.Row="3" />
-        <TextBox x:Name="textBoxCallsign" Grid.Column="1"  Grid.Row="3" Margin="2" VerticalContentAlignment="Center" Text="{Binding Callsign, Mode=OneWay}" />
+        <TextBox x:Name="textBoxCallsign" Grid.Column="1"  Grid.Row="3" Margin="2" VerticalContentAlignment="Center" Text="{Binding Callsign, Mode=OneWay}" MaxLength="8"/>
         <Label Content="{x:Static p:Resources.textLength}" HorizontalAlignment="Right" Grid.Row="4" />
         <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Row="4" Grid.Column="1" Value="{Binding Length, Mode=OneWay}" Margin="2" Minimum="0" />
         <Label Content="{x:Static p:Resources.textWidth}" HorizontalAlignment="Right" Grid.Row="5" />
diff --git a/src/BreCalClient/EditShipDialog.xaml.cs b/src/BreCalClient/EditShipDialog.xaml.cs
index db0799a..741c1f4 100644
--- a/src/BreCalClient/EditShipDialog.xaml.cs
+++ b/src/BreCalClient/EditShipDialog.xaml.cs
@@ -61,11 +61,27 @@ namespace BreCalClient
                         this.comboBoxParticipants.SelectedItem = p;
                 }
             }
+            this.EnableOK();
         }
 
         private void buttonResetParticipant_Click(object sender, RoutedEventArgs e)
         {
            this.comboBoxParticipants.SelectedItem = null;
         }
+
+        private void textBoxName_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            this.EnableOK();
+        }
+
+        private void integerUpDownIMO_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            this.EnableOK();
+        }
+
+        private void EnableOK()
+        {
+            this.buttonOK.IsEnabled = (this.textBoxName.Text.Length > 2) && (this.integerUpDownIMO.Value.HasValue);
+        }
     }
 }
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 6f4dbc9..6a29df7 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -49,7 +49,7 @@ namespace BreCalClient
         {
             this.comboBoxAgency.ItemsSource = BreCalLists.Participants_Agent;
 
-            this.comboBoxShip.ItemsSource = BreCalLists.AllShips;
+            this.comboBoxShip.ItemsSource = BreCalLists.Ships;
             Array types = Enum.GetValues(typeof(ShipcallType));
             List<ShipcallType> shipcallTypes = new List<ShipcallType>();
             bool first = true;
@@ -289,7 +289,13 @@ namespace BreCalClient
                     this.datePickerETA.Value = this.ShipcallModel.Shipcall.Eta;
                 // this.textBoxVoyage.Text = this.ShipcallModel.Shipcall.Voyage;
                 this.datePickerETD.Value = this.ShipcallModel.Shipcall.Etd;
-                this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
+                if (BreCalLists.Ships.Find(x => x.Ship.Id == this.ShipcallModel.Shipcall.ShipId) != null)
+                {
+                    this.comboBoxShip.SelectedValue = this.ShipcallModel.Shipcall.ShipId;
+                } else
+                {
+                    this.comboBoxShip.IsEnabled = false;
+                }
                 this.checkBoxCancelled.IsChecked = this.ShipcallModel.Shipcall.Canceled ?? false;
 
                 if (this.ShipcallModel.Shipcall.Type != ShipcallType.Shifting) // incoming, outgoing
diff --git a/src/BreCalClient/ShipListDialog.xaml.cs b/src/BreCalClient/ShipListDialog.xaml.cs
index b08d6f7..39bf3f1 100644
--- a/src/BreCalClient/ShipListDialog.xaml.cs
+++ b/src/BreCalClient/ShipListDialog.xaml.cs
@@ -51,6 +51,8 @@ namespace BreCalClient
                     await this.ShipApi.ShipDeleteAsync(shipmodel.Ship.Id);
                 BreCalLists.Ships.Remove(shipmodel); // remove from "selectable" ships
                 shipmodel.Ship.Deleted = true; // set deleted marker on working instance
+                this.dataGridShips.ItemsSource = null;
+                this.dataGridShips.ItemsSource = BreCalLists.AllShips;
             }
         }