diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs
index 01f2f70..7aacf0e 100644
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@@ -228,7 +228,7 @@ namespace Elwig.Services {
                     var certs = await OrganicService.GetTracesCertificates(m);
                     await App.MainDispatcher.BeginInvoke(() => {
                         if (m.MgNr != vm.MgNr) return;
-                        vm.FillOrganicInputs(certs.Length > 0 ? certs[0] : null);
+                        vm.FillOrganicInputs(certs.FirstOrDefault(c => c.IsValidForWineProduction));
                     });
                 });
             }
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 3182d19..18404ca 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -1566,7 +1566,7 @@ namespace Elwig.Windows {
                     if (IsCreating) {
                         try {
                             var certs = await OrganicService.GetTracesCertificates(m);
-                            valid = certs.Length > 0 && certs[0].IsValidForWineProduction;
+                            valid = certs.Any(c => c.IsValidForWineProduction);
                         } catch { }
                     }
                     if (valid)