diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config
index 9b96e2e..0800667 100644
--- a/src/BreCalClient/App.config
+++ b/src/BreCalClient/App.config
@@ -11,7 +11,7 @@
     <applicationSettings>
         <BreCalClient.Properties.Settings>
             <setting name="API_URL" serializeAs="String">
-                <value>https://brecal.bsmd-emswe.eu</value>
+                <value>https://brecaltest.bsmd-emswe.eu</value>
             </setting>
             <setting name="BG_COLOR" serializeAs="String">
                 <value>#751D1F</value>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index a195279..ec64f03 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -65,8 +65,8 @@ namespace BreCalClient
         public MainWindow()
         {
             InitializeComponent();
-            _api = new DefaultApi();
-            _api.Configuration.ApiKeyPrefix["Authorization"] = "Bearer";
+            _api = new DefaultApi(Properties.Settings.Default.API_URL);
+            _api.Configuration.ApiKeyPrefix["Authorization"] = "Bearer";            
         }
 
         #endregion
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 2eb9623..36857e3 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -109,6 +109,18 @@ namespace BreCalClient
                     if ((times.ParticipantId == participantId) && (times.ParticipantType == (int) type))
                         return times;
                 }
+                if(type == Extensions.ParticipantType.AGENCY)
+                {
+                    // if I am BSMD and no agency entry was found this means we are editing the agency entry
+                    if(App.Participant.Type == (int) Extensions.ParticipantType.BSMD)
+                    {
+                        foreach(Times times in this.Times)
+                        {
+                            if ((times.ParticipantId == App.Participant.Id) && (times.ParticipantType == (int) Extensions.ParticipantType.AGENCY))
+                                return times;
+                        }
+                    }
+                }
             }
             return null;
         }