diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 2dcf5a8..38ee163 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>E:\gitlager\git_brcal\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
+    <AssemblyVersion>0.6.0.0</AssemblyVersion>
+    <FileVersion>0.6.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 25ede33..ee95adf 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -99,12 +99,42 @@
         <Label Content="{x:Static p:Resources.textAnchored}" Grid.Column="3" Grid.Row="11" />
         <Label Content="{x:Static p:Resources.textMooredLock}" Grid.Column="3" Grid.Row="12" />
         <Label Content="{x:Static p:Resources.textCancelled}" Grid.Column="3" Grid.Row="13" />
-        
-        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id"/>
-        <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id"/>
-        <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id"/>
-        <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id"/>
-        <ComboBox Name="comboBoxTerminal" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id"/>
+
+        <ComboBox Name="comboBoxAgency" Grid.Column="3" Grid.Row="1" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearAgency" Click="contextMenuItemClearAgency_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+        <ComboBox Name="comboBoxMooring" Grid.Column="3" Grid.Row="2" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearMooring" Click="contextMenuItemClearMooring_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+        <ComboBox Name="comboBoxPilot" Grid.Column="3" Grid.Row="3" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearPilot" Click="contextMenuItemClearPilot_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+        <ComboBox Name="comboBoxTug" Grid.Column="3" Grid.Row="4" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTug" Click="contextMenuItemClearTug_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
+        <ComboBox Name="comboBoxTerminal" Grid.Column="3" Grid.Row="5" Margin="2" DisplayMemberPath="Name" SelectedValuePath="Id">
+            <ComboBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="{x:Static p:Resources.textClearAssignment}" Name="contextMenuItemClearTerminal" Click="contextMenuItemClearTerminal_Click" />
+                </ContextMenu>
+            </ComboBox.ContextMenu>
+        </ComboBox>
         
         <xctk:DateTimePicker Name="datePickerTidalWindowFrom" Grid.Column="3" Grid.Row="7" Margin="2" />
         <xctk:DateTimePicker Name="datePickerTidalWindowTo" Grid.Column="3" Grid.Row="8" Margin="2" />
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 933a230..6730be8 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -93,6 +93,35 @@ namespace BreCalClient
 
         #endregion
 
+        #region Context menu handlers
+
+        private void contextMenuItemClearAgency_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxAgency.SelectedIndex = -1;
+        }
+
+        private void contextMenuItemClearMooring_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxMooring.SelectedIndex = -1;
+        }
+
+        private void contextMenuItemClearPilot_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxPilot.SelectedIndex = -1;
+        }
+
+        private void contextMenuItemClearTug_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxTug.SelectedIndex = -1;
+        }
+
+        private void contextMenuItemClearTerminal_Click(object sender, RoutedEventArgs e)
+        {
+            this.comboBoxTerminal.SelectedIndex = -1;
+        }
+
+        #endregion
+
         #region private methods
 
         private void CopyToModel()
@@ -190,6 +219,7 @@ namespace BreCalClient
         }
 
         #endregion
+
         
     }
 }
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
index 4f7a307..3a8097c 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.3.0.0</ApplicationVersion>
+    <ApplicationVersion>0.6.0.0</ApplicationVersion>
     <BootstrapperEnabled>False</BootstrapperEnabled>
     <Configuration>Release</Configuration>
     <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 3e1de73..6c635c3 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -297,6 +297,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clear assignment.
+        /// </summary>
+        public static string textClearAssignment {
+            get {
+                return ResourceManager.GetString("textClearAssignment", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Close.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 6009777..db118d4 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -199,10 +199,10 @@
   <data name="textEditTimes" xml:space="preserve">
     <value>Zeiten bearbeiten</value>
   </data>
-	<data name="textETABerth" xml:space="preserve">
+  <data name="textETABerth" xml:space="preserve">
     <value>ETA Liegeplatz</value>
   </data>
-	<data name="textETDBerth" xml:space="preserve">
+  <data name="textETDBerth" xml:space="preserve">
     <value>ETD Liegeplatz</value>
   </data>
   <data name="textEnterKeyword" xml:space="preserve">
@@ -226,7 +226,7 @@
   <data name="textFixed" xml:space="preserve">
     <value>Fest</value>
   </data>
-	<data name="textLockTime" xml:space="preserve">
+  <data name="textLockTime" xml:space="preserve">
     <value>Zeit Schleuse</value>
   </data>
   <data name="textOperationsEnd" xml:space="preserve">
@@ -358,4 +358,7 @@
   <data name="worker2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>worker2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="textClearAssignment" xml:space="preserve">
+    <value>Zuordnung entfernen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 531d465..ead164b 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -193,6 +193,9 @@
   <data name="textChangePassword" xml:space="preserve">
     <value>Change password</value>
   </data>
+  <data name="textClearAssignment" xml:space="preserve">
+    <value>Clear assignment</value>
+  </data>
   <data name="textClose" xml:space="preserve">
     <value>Close</value>
   </data>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 208090d..c84ee38 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -64,21 +64,20 @@ namespace BreCalClient
                 this.labelAgent.Content = name;
                 agentName = name;
             }
-            name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.MOORING);
-            if (name != null)
-                this.labelMooring.Content = name;
+            name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.MOORING);            
+            this.labelMooring.Content = (name != null) ? name : "- / -";
+            
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.PILOT);
-            if (name != null)
-                this.labelPilot.Content = name;
+            this.labelPilot.Content = (name != null) ? name : "- / - ";
+
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.TUG);
-            if (name != null)
-                this.labelTug.Content = name;
+            this.labelTug.Content = (name != null) ? name : "- / - ";
+
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.PORT_ADMINISTRATION);
-            if (name != null)
-                this.labelPortAuthority.Content = name;
+            this.labelPortAuthority.Content = (name != null) ? name : "- / - ";
+
             name = this.ShipcallControlModel.GetParticipantNameForType(Extensions.ParticipantType.TERMINAL);
-            if (name != null)
-                this.labelTerminal.Content = name;
+            this.labelTerminal.Content = (name != null) ? name : "- / - ";
 
             if(App.Participant.IsFlagSet(Extensions.ParticipantType.TERMINAL)) {
                 this.labelTerminal.FontWeight = FontWeights.Bold;
@@ -109,6 +108,11 @@ namespace BreCalClient
                 this.labelTug.FontWeight = FontWeights.Bold;
                 this.labelTug.Foreground = Brushes.LightYellow;
             }
+            if (App.Participant.IsFlagSet(Extensions.ParticipantType.BSMD))
+            {
+                this.labelShipName.FontWeight = FontWeights.Bold;
+                this.labelShipName.Foreground = Brushes.LightYellow;
+            }
 
             this.labelShipName.Content = this.ShipcallControlModel?.Ship?.Name;
             switch(this.ShipcallControlModel?.Shipcall?.Type)