diff --git a/apps/portal/src/components/common/ProductsSection.js b/apps/portal/src/components/common/ProductsSection.js
index 4c352631ec..472e5d37fd 100644
--- a/apps/portal/src/components/common/ProductsSection.js
+++ b/apps/portal/src/components/common/ProductsSection.js
@@ -957,10 +957,6 @@ function ProductsSection({onPlanSelect, products, type = null, handleChooseSignu
         onPlanSelect(null, selectedPrice.id);
     }, [selectedPrice.id, onPlanSelect]);
 
-    if (!portalPlans.includes('monthly') && !portalPlans.includes('yearly')) {
-        return null;
-    }
-
     if (products.length === 0) {
         if (isComplimentary) {
             const supportAddress = getSupportAddress({site});
@@ -979,11 +975,6 @@ function ProductsSection({onPlanSelect, products, type = null, handleChooseSignu
         className += ' gh-portal-upgrade-product';
     }
 
-    // If site doesn't have paid products then don't return an empty container
-    if (hasOnlyFree) {
-        return null;
-    }
-
     let finalProduct = products.find(p => p.id === selectedProduct)?.id || products.find(p => p.type === 'paid')?.id;
     return (
         <ProductsContext.Provider value={{
diff --git a/apps/portal/src/components/pages/SignupPage.js b/apps/portal/src/components/pages/SignupPage.js
index 4c08b1eafb..be8e7ad7a9 100644
--- a/apps/portal/src/components/pages/SignupPage.js
+++ b/apps/portal/src/components/pages/SignupPage.js
@@ -208,6 +208,10 @@ footer.gh-portal-signup-footer.invite-only .gh-portal-signup-message {
 }
 
 .signup.single-field .gh-portal-signup-terms-wrapper {
+    margin-top: 12px;
+}
+
+.signup.single-field .gh-portal-products:not(:has(.gh-portal-product-card)) {
     margin-top: -16px;
 }
 
@@ -216,11 +220,11 @@ footer.gh-portal-signup-footer.invite-only .gh-portal-signup-message {
 }
 
 .gh-portal-signup-terms-wrapper.free-only .gh-portal-signup-terms {
-    margin: -16px 0 0;
+    margin: -16px 0 24px;
 }
 
-.gh-portal-products + .gh-portal-signup-terms-wrapper.free-only {
-    margin: 20px auto 0;
+.gh-portal-products:has(.gh-portal-product-card) + .gh-portal-signup-terms-wrapper.free-only {
+    margin: 20px auto 0 !important;
 }
 
 .gh-portal-signup-terms label {
@@ -699,6 +703,8 @@ class SignupPage extends React.Component {
         const hasOnlyFree = hasOnlyFreeProduct({site}) || showOnlyFree;
         const sticky = !showOnlyFree && (freeBenefits.length || freeDescription);
 
+        const signupTerms = this.renderSignupTerms();
+
         return (
             <section className="gh-portal-signup">
                 <div className='gh-portal-section'>
@@ -713,14 +719,18 @@ class SignupPage extends React.Component {
                         {(hasOnlyFree ?
                             <>
                                 {this.renderProducts()}
+                                {signupTerms &&
                                 <div className='gh-portal-signup-terms-wrapper free-only'>
-                                    {this.renderSignupTerms()}
+                                    {signupTerms}
                                 </div>
+                                }
                             </> :
                             <>
+                                {signupTerms &&
                                 <div className='gh-portal-signup-terms-wrapper'>
-                                    {this.renderSignupTerms()}
+                                    {signupTerms}
                                 </div>
+                                }
                                 {this.renderProducts()}
                             </>)}
 
diff --git a/apps/portal/src/tests/SignupFlow.test.js b/apps/portal/src/tests/SignupFlow.test.js
index 59ca363477..dfb587cc39 100644
--- a/apps/portal/src/tests/SignupFlow.test.js
+++ b/apps/portal/src/tests/SignupFlow.test.js
@@ -260,17 +260,25 @@ describe('Signup', () => {
                 site: FixtureSite.singleTier.onlyFreePlan
             });
 
+            const freeProduct = FixtureSite.singleTier.onlyFreePlan.products.find(p => p.type === 'free');
+            const benefitText = freeProduct.benefits[0].name;
+
             expect(popupFrame).toBeInTheDocument();
             expect(triggerButtonFrame).toBeInTheDocument();
             expect(siteTitle).toBeInTheDocument();
             expect(emailInput).toBeInTheDocument();
             expect(nameInput).toBeInTheDocument();
-            expect(freePlanTitle).not.toBeInTheDocument();
             expect(monthlyPlanTitle).not.toBeInTheDocument();
             expect(yearlyPlanTitle).not.toBeInTheDocument();
             expect(fullAccessTitle).not.toBeInTheDocument();
             expect(signinButton).toBeInTheDocument();
             expect(submitButton).not.toBeInTheDocument();
+
+            // Free tier title, description and benefits should render
+            expect(freePlanTitle).toBeInTheDocument();
+            await within(popupIframeDocument).findByText(freeProduct.description);
+            await within(popupIframeDocument).findByText(benefitText);
+
             submitButton = within(popupIframeDocument).queryByRole('button', {name: 'Sign up'});
 
             fireEvent.change(emailInput, {target: {value: 'jamie@example.com'}});
@@ -613,14 +621,22 @@ describe('Signup', () => {
                 site: FixtureSite.multipleTiers.onlyFreePlan
             });
 
+            const freeProduct = FixtureSite.multipleTiers.onlyFreePlan.products.find(p => p.type === 'free');
+            const benefitText = freeProduct.benefits[0].name;
+
             expect(popupFrame).toBeInTheDocument();
             expect(triggerButtonFrame).toBeInTheDocument();
             expect(siteTitle).toBeInTheDocument();
             expect(emailInput).toBeInTheDocument();
             expect(nameInput).toBeInTheDocument();
-            expect(freePlanTitle.length).toBe(0);
             expect(signinButton).toBeInTheDocument();
             expect(submitButton).not.toBeInTheDocument();
+
+            // Free tier title, description and benefits should render
+            expect(freePlanTitle.length).toBe(1);
+            await within(popupIframeDocument).findByText(freeProduct.description);
+            await within(popupIframeDocument).findByText(benefitText);
+
             submitButton = within(popupIframeDocument).queryByRole('button', {name: 'Sign up'});
 
             fireEvent.change(emailInput, {target: {value: 'jamie@example.com'}});
diff --git a/apps/portal/src/utils/fixtures-generator.js b/apps/portal/src/utils/fixtures-generator.js
index 750bb12a96..f831eefcd7 100644
--- a/apps/portal/src/utils/fixtures-generator.js
+++ b/apps/portal/src/utils/fixtures-generator.js
@@ -261,11 +261,13 @@ export function getFreeProduct({
 }
 
 export function getBenefits({numOfBenefits}) {
+    const random = Math.floor(Math.random() * 100);
+
     const beenfits = [
-        getBenefitData({name: 'Limited early adopter pricing'}),
-        getBenefitData({name: 'Latest gear reviews'}),
-        getBenefitData({name: 'Weekly email newsletter'}),
-        getBenefitData({name: 'Listen to my podcast'})
+        getBenefitData({name: `Limited early adopter pricing #${random}`}),
+        getBenefitData({name: `Latest gear reviews #${random}`}),
+        getBenefitData({name: `Weekly email newsletter #${random}`}),
+        getBenefitData({name: `Listen to my podcast #${random}`})
     ];
     return beenfits.slice(0, numOfBenefits);
 }
diff --git a/apps/portal/src/utils/test-fixtures.js b/apps/portal/src/utils/test-fixtures.js
index f6fa6b9376..63d7725860 100644
--- a/apps/portal/src/utils/test-fixtures.js
+++ b/apps/portal/src/utils/test-fixtures.js
@@ -41,7 +41,7 @@ export const singleSiteTier = [
     getFreeProduct({
         name: 'Free',
         description: 'Free tier description',
-        numOfBenefits: 0
+        numOfBenefits: 1
     })
     ,
     getProductData({