diff --git a/Dan.Core/Helpers/X509CertificateHelper.cs b/Dan.Core/Helpers/X509CertificateHelper.cs
index c575da2..c426fa1 100644
--- a/Dan.Core/Helpers/X509CertificateHelper.cs
+++ b/Dan.Core/Helpers/X509CertificateHelper.cs
@@ -44,12 +44,23 @@ private static string GetOrgFromCertificate(X509Certificate2 certificate)
         }
 
         var subjectList = certificateSubject.Split(',');
+        bool seid20 = certificateSubject.Contains("NTRNO");
 
         foreach (var s in subjectList)
         {
             var kvp = s.Trim().Split('=');
-            if (kvp.Length != 2 || !kvp[0].Equals("SERIALNUMBER")) continue;
-            orgNumber = kvp[1].Trim();
+            if (kvp.Length != 2 || !kvp[0].Equals("SERIALNUMBER") && !kvp[1].Contains("NTRNO"))
+            {
+                continue;
+            }
+
+            if (!seid20)
+            {
+                orgNumber = kvp[1].Trim();
+            } else
+            {
+                orgNumber = kvp[1].Replace("NTRNO-", "");
+            }
             break;
         }