diff --git a/website/api/controllers/customers/save-billing-info-and-subscribe.js b/website/api/controllers/customers/save-billing-info-and-subscribe.js
index bc7c758c37..cdc55a3fda 100644
--- a/website/api/controllers/customers/save-billing-info-and-subscribe.js
+++ b/website/api/controllers/customers/save-billing-info-and-subscribe.js
@@ -98,7 +98,7 @@ module.exports = {
     // Generate the license key for this subscription
     let licenseKey = await sails.helpers.createLicenseKey.with({
       numberOfHosts: quoteRecord.numberOfHosts,
-      organization: this.req.me.organization,
+      organization: this.req.me.organization ? this.req.me.organization : this.req.me.emailAddress,
       validTo: subscription.current_period_end
     });