diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 5d4ee10..bc679ab 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -124,6 +124,8 @@ namespace BreCalClient
         {
             Extensions.ParticipantType pType = (Extensions.ParticipantType) this.Times.ParticipantType;
 
+            // setting visibility
+
             if (pType != Extensions.ParticipantType.MOORING)
             {
                 this.labelATA.Visibility = Visibility.Hidden;
@@ -145,40 +147,32 @@ namespace BreCalClient
                 }
             }
 
+            // setting en/dis-abled
+
             if (this.Times.ParticipantId != App.Participant.Id)
             {
                 this.buttonFixedOrder.IsEnabled = false;
                 return; // if this is not "my" entry, there is no editing!
-            }                                   
-
-            if(pType == Extensions.ParticipantType.MOORING)
-            {
-                this.datePickerATA.IsEnabled = true;
-                this.datePickerATD.IsEnabled = true;
             }
 
+            this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+            this.datePickerETABerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
+            this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
+            this.textBoxRemarks.IsEnabled = true;
 
             switch (pType)
             {
                 case Extensions.ParticipantType.MOORING:
-                case Extensions.ParticipantType.PORT_ADMINISTRATION:
-                case Extensions.ParticipantType.TUG:
-                    this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
-                    this.datePickerETABerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
-                    this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
-                    this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
-                    this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
-                    this.datePickerZoneEntry.IsEnabled = false;                    
-                    this.textBoxRemarks.IsEnabled = true;
+                    this.datePickerATA.IsEnabled = true;
+                    this.datePickerATD.IsEnabled = true;
                     break;
-                case Extensions.ParticipantType.PILOT:
-                    this.datePickerETABerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
-                    this.datePickerETABerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);
-                    this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
-                    this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);
-                    this.datePickerLockTime.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting);                    
-                    this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                    
-                    this.textBoxRemarks.IsEnabled = true;
+                case Extensions.ParticipantType.PORT_ADMINISTRATION:
+                    this.datePickerLockTime.IsEnabled = true;
+                    break;
+                case Extensions.ParticipantType.TUG:                    
+                case Extensions.ParticipantType.PILOT:                    
+                    this.datePickerZoneEntry.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival);                                        
                     break;
             }
 
@@ -204,8 +198,12 @@ namespace BreCalClient
 
         private void CheckOKButton()
         {
-            this.buttonOK.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) ?
-                this.datePickerETABerth.Value.HasValue : this.datePickerETDBerth.Value.HasValue;
+            Extensions.ParticipantType pType = (Extensions.ParticipantType)this.Times.ParticipantType;
+            if (pType != Extensions.ParticipantType.PORT_ADMINISTRATION)
+                this.buttonOK.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Arrival) ?
+                    this.datePickerETABerth.Value.HasValue : this.datePickerETDBerth.Value.HasValue;
+            else
+                this.buttonOK.IsEnabled = true;
         }
 
         #endregion
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index e189db6..b9faa9f 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -168,13 +168,16 @@
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20" />
+                        <RowDefinition Height="0" x:Name="lockTimeRowDefinition" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <Label Grid.Row="0" Grid.Column="0" x:Name="labelETAETDPortAuthority" Content="ETA" Padding="0" VerticalContentAlignment="Center" />
-                    <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textRemarks}" Padding="0" VerticalContentAlignment="Top" FontSize="9"/>
+                    <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textLockTime}" VerticalContentAlignment="Center" Padding="0"/>
+                    <Label Grid.Row="1" Grid.Column="1" x:Name="labelPortAuthorityLockTime" VerticalContentAlignment="Center" Padding="0" />
                     <Label Grid.Row="0" Grid.Column="1" Padding="0" VerticalContentAlignment="Center" x:Name="labelPortAuthorityETAETDValue" FontWeight="DemiBold"/>
-                    <Image Grid.Row="1" Grid.Column="0" x:Name="imagePortAuthorityLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
-                    <TextBlock Grid.Row="1" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPortAuthorityRemarks"/>
+                    <Image Grid.Row="2" Grid.Column="0" x:Name="imagePortAuthorityLocked" VerticalAlignment="Top" Margin="0 20 0 0" HorizontalAlignment="Left" Source="./Resources/lock.png" Width="16" Height="16" ToolTip="{x:Static p:Resources.textFixedOrder}"/>
+                    <TextBlock Grid.Row="2" Grid.Column="1" Padding="0" TextWrapping="Wrap" VerticalAlignment="Top" x:Name="textBlockPortAuthorityRemarks"/>
                 </Grid>
             </Border>
             <!-- PILOT -->
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index ae9433c..fd7c82c 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -28,6 +28,7 @@ namespace BreCalClient
         private static readonly ILog _log = LogManager.GetLogger(typeof(ShipcallControl));
         bool ataAdded = false;
         bool atdAdded = false;
+        bool lockTimeAdded = false;
 
         #endregion
 
@@ -351,7 +352,7 @@ namespace BreCalClient
                                 {                                    
 
                                     ataRowDefinition.Height = new GridLength(15);
-                                    labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm"); ;                                    
+                                    labelTimesMooringATA.Content = mooringTimes.Ata.Value.ToString("dd.MM.yyyy HH:mm");
                                     ataAdded = true;
                                 }
                             }
@@ -380,6 +381,15 @@ namespace BreCalClient
                             this.labelPortAuthorityETAETDValue.Content = portAuthorityTimes.DisplayTime(this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Arrival);
                             this.textBlockPortAuthorityRemarks.Text = portAuthorityTimes.Remarks;                            
                             this.imagePortAuthorityLocked.Visibility = (portAuthorityTimes.EtaBerthFixed ?? false) ? Visibility.Visible : Visibility.Hidden;
+                            if(portAuthorityTimes.LockTime.HasValue)
+                            {
+                                if(!lockTimeAdded)
+                                {
+                                    lockTimeRowDefinition.Height = new GridLength(15);
+                                    labelPortAuthorityLockTime.Content = portAuthorityTimes.LockTime.Value.ToString("dd.MM.yyyy HH:mm");
+                                    lockTimeAdded = true;
+                                }
+                            }
                         }
                         else
                         {