diff --git a/saas/app/views/account/settings/_free_plan.html.erb b/saas/app/views/account/settings/_free_plan.html.erb
index 4785de354..548fa9a40 100644
--- a/saas/app/views/account/settings/_free_plan.html.erb
+++ b/saas/app/views/account/settings/_free_plan.html.erb
@@ -1,13 +1,16 @@
-<% if Current.account.exceeding_card_limit? %>
-  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You've used up your <u><%= Plan.free.card_limit %></u> free cards</h3>
+<% if Current.account.exceeding_card_limit? && Current.account.exceeding_storage_limit? %>
+  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You’ve used up your <u><%= number_with_delimiter(Plan.free.card_limit) %></u> free cards and all <u><%= storage_to_human_size(Plan.free.storage_limit) %></u> of free storage</h3>
+<% elsif Current.account.exceeding_card_limit? %>
+  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You’ve used up your <u><%= number_with_delimiter(Plan.free.card_limit) %></u> free cards</h3>
+<% elsif Current.account.exceeding_storage_limit? %>
+  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You’ve used up all <u><%= storage_to_human_size(Plan.free.storage_limit) %></u> free storage</h3>
 <% else %>
-  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You've used <u><%= Current.account.billed_cards_count %></u> free cards out of <%= Plan.free.card_limit %></h3>
+  <h3 class="margin-block-start margin-block-end-half txt-large font-weight-black">You’ve used <u><%= Current.account.billed_cards_count %></u> free cards out of <%= number_with_delimiter(Plan.free.card_limit) %></h3>
 <% end %>
 
-<p class="margin-none-block-start">If you'd like to keep using Fizzy past <%= Plan.free.card_limit %> cards, it's only <strong>$<%= Plan.paid.price %>/month</strong> for <strong>unlimited cards</strong> + <strong>unlimited users</strong>. You'll also get <strong><%= storage_to_human_size(Plan.paid.storage_limit) %></strong> of storage. </p>
+<p class="margin-none-block-start">To keep using Fizzy <%= "past #{ number_with_delimiter(Plan.free.card_limit) } cards," unless Current.account.exceeding_storage_limit? %> it’s only <strong>$<%= Plan.paid.price %>/month</strong> for <strong>unlimited cards</strong>, <strong>unlimited users</strong>, and <strong><%= storage_to_human_size(Plan.paid.storage_limit) %></strong> of storage.</p>
 
 <%= button_to "Upgrade to #{Plan.paid.name} for $#{ Plan.paid.price }/month", account_subscription_path, class: "btn settings-subscription__button txt-medium", form: { data: { turbo: false } } %>
-<%= button_to "Upgrade to #{Plan.paid_with_extra_storage.name} for $#{ Plan.paid_with_extra_storage.price }/month", account_subscription_path(plan_key: Plan.paid_with_extra_storage.key), class: "btn settings-subscription__button txt-medium", form: { data: { turbo: false } } %>
 
 <p>Cancel anytime, no contracts, take your data with you whenever.</p>
-<p class="settings-subscription__footer txt-small margin-none-block-end">Right now you're on the <strong><%= Current.account.plan.name %></strong> plan which includes <%= Plan.free.card_limit %> cards, unlimited users, and <%= storage_to_human_size(Plan.free.storage_limit) %> of storage.</p>
+<p class="settings-subscription__footer txt-small margin-none-block-end">Right now you’re on the <strong><%= Current.account.plan.name %></strong> plan which includes <%= number_with_delimiter(Plan.free.card_limit) %> cards, unlimited users, and <%= storage_to_human_size(Plan.free.storage_limit) %> of storage.</p>