diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index b6c23a0..8deaae6 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -236,6 +236,7 @@ namespace BreCalClient
             if (this.Times.ParticipantId != App.Participant.Id)
             {
                 this.buttonFixedOrder.IsEnabled = false;
+                this.buttonOK.IsEnabled = false;
                 return; // if this is not "my" entry, there is no editing!
             }
 
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index 6e9af6a..92732f4 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -208,7 +208,11 @@ namespace BreCalClient
 
         private void EnableControls()
         {
-            if (this.Times.ParticipantId != App.Participant.Id) return;
+            if (this.Times.ParticipantId != App.Participant.Id)
+            {
+                this.buttonOK.IsEnabled = false;
+                return;
+            }
 
             this.datePickerOperationStart.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;
             this.datePickerOperationStart_End.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival;