diff --git a/docs/_config.yml b/docs/_config.yml
index 622fa96..3a22922 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -120,6 +120,11 @@ issues_template: |
 
 oss_template: |
   <p class="mt-6">You contributed to the following repositories, with <strong>{{ format downloads }}</strong> combined daily downloads:</p>
+  <p>
+  <img src="https://img.shields.io/endpoint?label=popular%20packages&style=social&logo=nuget&url=https%3A%2F%2Fsponsorlink.devlooped.com%2Fnuget%2Fall?{{account}}" />
+  <img src="https://img.shields.io/endpoint?label=Daily%20downloads&style=social&logo=nuget&url=https%3A%2F%2Fsponsorlink.devlooped.com%2Fnuget%2Fdl?{{account}}" />
+  <a href="#" onclick="copyMarkdown(event)"><img src="https://img.shields.io/badge/copy-md?logo=Markdown&color=%23000000"></a>
+  </p>
   <table class="borderless" style="border-collapse: collapse; padding: 4px; min-width: unset;">
       <tr>
           <th class="borderless">Repository</th>
diff --git a/docs/assets/js/oss.js b/docs/assets/js/oss.js
index a24aee2..e0e8ac1 100644
--- a/docs/assets/js/oss.js
+++ b/docs/assets/js/oss.js
@@ -1,3 +1,6 @@
+---
+layout: null
+---
 Handlebars.registerHelper('format', function(number) {
     return new Intl.NumberFormat().format(number);
   });
@@ -75,7 +78,7 @@ async function lookupAccount() {
             }, 0);
           }, 0);
 
-        document.getElementById('data').innerHTML = template({ repositories: repositories, downloads: totalDownloads });
+        document.getElementById('data').innerHTML = template({ account: account, icon: "{{ '/assets/img/copy.svg' | relative_url }}", repositories: repositories, downloads: totalDownloads });
         document.getElementById('unsupported').style.display = 'none';
         document.getElementById('supported').style.display = '';
 
@@ -101,4 +104,17 @@ function setError(message) {
 
 function setBusy(busy) {
     document.getElementById('spinner').style.display = busy ? '' : 'none';
+}
+
+function copyMarkdown() {
+    const url = new URL(window.location);
+    const account = url.searchParams.get('a');
+    if (account)
+    {
+        const markdown = `
+![Popular packages](https://img.shields.io/endpoint?label=popular%20packages&style=social&logo=nuget&url=https%3A%2F%2Fsponsorlink.devlooped.com%2Fnuget%2Fall?${account})
+![Daily downloads](https://img.shields.io/endpoint?label=Daily%20downloads&style=social&logo=nuget&url=https%3A%2F%2Fsponsorlink.devlooped.com%2Fnuget%2Fdl?${account})
+`;
+        navigator.clipboard.writeText(markdown);
+    }
 }
\ No newline at end of file
diff --git a/src/Web/Stats.cs b/src/Web/Stats.cs
index fec34bb..a82099d 100644
--- a/src/Web/Stats.cs
+++ b/src/Web/Stats.cs
@@ -14,11 +14,26 @@ public async Task<HttpResponseData> NuGetCountAsync([HttpTrigger(AuthorizationLe
     {
         var stats = await oss;
         var manifest = await manager.GetManifestAsync();
-        var owner = req.Query.Count == 1 ? req.Query.ToString() : manifest.Sponsorable;
+        var count = 0;
 
-        var count = stats.Packages
-            .Where(x => x.Key.StartsWith(owner + "/"))
-            .Sum(x => x.Value.Count);
+        if (req.Query.Count == 1)
+        {
+            // Sum all packages across all repositories contributed to by the author in the querystring
+            if (req.Query.ToString() is { } author && 
+                stats.Authors.TryGetValue(author, out var repositories))
+            {
+                count = stats.Packages
+                    .Where(x => repositories.Contains(x.Key))
+                    .SelectMany(x => x.Value.Keys)
+                    .Count();
+            }
+        }
+        else
+        {
+            count = stats.Packages
+                .Where(x => x.Key.StartsWith(manifest.Sponsorable + "/"))
+                .Sum(x => x.Value.Count);
+        }
 
         var output = req.CreateResponse(HttpStatusCode.OK);
 
@@ -39,11 +54,25 @@ public async Task<HttpResponseData> NuGetDownloadsAsync([HttpTrigger(Authorizati
     {
         var stats = await oss;
         var manifest = await manager.GetManifestAsync();
-        var owner = req.Query.Count == 1 ? req.Query.ToString() : manifest.Sponsorable;
+        var count = 0l;
 
-        var count = stats.Packages
-            .Where(x => x.Key.StartsWith(owner + "/"))
-            .Sum(x => x.Value.Sum(y => y.Value));
+        if (req.Query.Count == 1)
+        {
+            // Sum all packages across all repositories contributed to by the author in the querystring
+            if (req.Query.ToString() is { } author &&
+                stats.Authors.TryGetValue(author, out var repositories))
+            {
+                count = stats.Packages
+                    .Where(x => repositories.Contains(x.Key))
+                    .Sum(x => x.Value.Sum(x => x.Value));
+            }
+        }
+        else
+        {
+            count = stats.Packages
+                .Where(x => x.Key.StartsWith(manifest.Sponsorable + "/"))
+                .Sum(x => x.Value.Sum(y => y.Value));
+        }
 
         var output = req.CreateResponse(HttpStatusCode.OK);