diff --git a/lib/support.js b/lib/support.js
index fc53ec096a098..418d37fab5ffb 100644
--- a/lib/support.js
+++ b/lib/support.js
@@ -129,7 +129,23 @@ function downloadSupportData (supportablePackages, cb) {
                 })
               }
               contributorData.url = contributor.url
-              done(null, contributorData)
+              var result = {
+                name: contributorData.name,
+                type: contributorData.type,
+                url: contributor.url
+              }
+              if (looksLikeURL(contributorData.homepage)) {
+                result.homepage = contributorData.homepage
+              }
+              if (
+                Array.isArray(contributorData.links) &&
+                contributorData.links.every(function (element) {
+                  return looksLikeURL(element)
+                })
+              ) {
+                result.links = contributorData.links
+              }
+              done(null, result)
             })
           }
         }), 5, function (error, resolvedContributors) {