diff --git a/src/Vipps.net/Infrastructure/VippsHttpClient.cs b/src/Vipps.net/Infrastructure/VippsHttpClient.cs
index 8e47b7d..1319af4 100644
--- a/src/Vipps.net/Infrastructure/VippsHttpClient.cs
+++ b/src/Vipps.net/Infrastructure/VippsHttpClient.cs
@@ -82,8 +82,18 @@ private Dictionary<string, string> GetHeaders()
                 { "Vipps-System-Name", assemblyName.Name },
                 { "Vipps-System-Version", assemblyVersion },
                 { "Merchant-Serial-Number", _options.MerchantSerialNumber },
-                { "Vipps-System-Plugin-Name", _options.PluginName },
-                { "Vipps-System-Plugin-Version", _options.PluginVersion }
+                {
+                    "Vipps-System-Plugin-Name",
+                    string.IsNullOrWhiteSpace(_options.PluginName)
+                        ? "acme-plugin"
+                        : _options.PluginName
+                },
+                {
+                    "Vipps-System-Plugin-Version",
+                    string.IsNullOrWhiteSpace(_options.PluginVersion)
+                        ? "0.0.1"
+                        : _options.PluginVersion
+                }
             };
         }
     }
diff --git a/src/Vipps.net/Vipps.net.csproj b/src/Vipps.net/Vipps.net.csproj
index a086c35..4f1b473 100644
--- a/src/Vipps.net/Vipps.net.csproj
+++ b/src/Vipps.net/Vipps.net.csproj
@@ -6,7 +6,7 @@
     <Product>Vipps.net</Product>
     <Description>Vipps.net SDK</Description>
     <PackageId>Vipps.net</PackageId>
-    <Version>0.9.5</Version>
+    <Version>0.9.6</Version>
     <Authors>Vipps Mobilepay AS</Authors>
     <Company>Vipps Mobilepay AS</Company>
     <Title>Vipps SDK .Net</Title>