diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 0b1fc55a6..862a0c67e 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -119,9 +119,9 @@ namespace BeWo
 							AutoLogin = false,
 							//SelectView = UIContext.Finance,
 							SelectIndex = 8,
-							Username = "m1",
-							Password = "bewobewo",
-							Profilename = "5000000000"
+							//Username = "m1",
+							//Password = "bewobewo",
+							//Profilename = "5000000000"
 						});
 
 			return name2config;
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index b0e4a10fe..f4b647c6a 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -364,6 +364,9 @@ namespace BeWo.View.Detail.Accounting
 		{
             _Viewmodel.FirePropertyChangedItself();
 
+            if (_NewGkvAbrechnungPopUpView.PopupObjectList is object)
+                _NewGkvAbrechnungPopUpView.PopupObjectList = null;
+
             RefreshGkvAbrechnungenList();
         }
 	}
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
index ec2667ce3..88ffe5ea3 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml
@@ -294,8 +294,6 @@
                 Width="370"
                 Height="250"
                 Margin="10"
-                Closed="popup_Closed"
-                Opened="popup_Opened"
                 Placement="MousePoint"
                 StaysOpen="False">
                 <localSearchView:OrganisationSearchView x:Name="gkvsearchview" SearchMode="OnlyValidGkvOrganisations" />
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
index dd61542c1..b7442bf34 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
@@ -60,6 +60,12 @@ namespace BeWo.View.Detail.Accounting
 			}
 		}
 
+		public object PopupObjectList
+		{
+			get => gkvsearchview.ObjectList;
+			set => gkvsearchview.ObjectList = value as List<CompactOrganisationDC>;
+		}
+
 		public DateTime FilterStart
 		{
 			get => ViewModel.AbrechnungsZeitraumStart.Value;