diff --git a/etc/admin.conf b/etc/admin.conf
index 5b98ba5..75614f1 100644
--- a/etc/admin.conf
+++ b/etc/admin.conf
@@ -6,6 +6,7 @@
         voicemail_features="[% www_admin.voicemail_features %]"
         fax_features="[% www_admin.fax_features %]"
         customer_features="0"
+        product_features="0"
         cc_dial_prefix="[% www_admin.cc_dial_prefix %]"
         ac_dial_prefix="[% www_admin.ac_dial_prefix %]"
        >
diff --git a/lib/admin/Controller/account.pm b/lib/admin/Controller/account.pm
index c5dbba5..cb46fab 100644
--- a/lib/admin/Controller/account.pm
+++ b/lib/admin/Controller/account.pm
@@ -126,15 +126,17 @@ sub detail : Local {
 
         # we only use this to fill the drop-down lists
         if($c->request->params->{edit_account}) {
-            my $products;
-            return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
-                                                                undef,
-                                                                \$products
-                                                              );
-            $c->stash->{products} = [ grep { $$_{data}{class} eq 'voip' }
-                                        sort { $$a{data}{name} cmp $$b{data}{name} }
-                                          eval { @$products }
-                                    ];
+            if($c->config->{product_features}) {
+                my $products;
+                return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
+                                                                    undef,
+                                                                    \$products
+                                                                  );
+                $c->stash->{products} = [ grep { $$_{data}{class} eq 'voip' }
+                                            sort { $$a{data}{name} cmp $$b{data}{name} }
+                                              eval { @$products }
+                                        ];
+            }
             my $billing_profiles;
             return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_billing_profiles',
                                                                 undef,
diff --git a/lib/admin/Controller/billing.pm b/lib/admin/Controller/billing.pm
index d792678..4c3484a 100644
--- a/lib/admin/Controller/billing.pm
+++ b/lib/admin/Controller/billing.pm
@@ -26,12 +26,14 @@ sub index : Private {
     my ( $self, $c ) = @_;
     $c->stash->{template} = 'tt/billing.tt';
 
-    my $products;
-    return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
-                                                        undef,
-                                                        \$products
-                                                      );
-    $c->stash->{products} = $products if eval { @$products };
+    if($c->config->{product_features}) {
+        my $products;
+        return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_products',
+                                                            undef,
+                                                            \$products
+                                                          );
+        $c->stash->{products} = $products if eval { @$products };
+    }
 
     my $bilprofs;
     return unless $c->model('Provisioning')->call_prov( $c, 'billing', 'get_billing_profiles',
diff --git a/root/tt/account_detail.tt b/root/tt/account_detail.tt
index 971337e..eda8f1f 100644
--- a/root/tt/account_detail.tt
+++ b/root/tt/account_detail.tt
@@ -66,7 +66,9 @@
                 </td>
               </tr>
             [% END %]
+
             [% IF billing_features %]
+              [% IF Catalyst.config.product_features %]
               <tr>
                 <td class="tdkey">product:</td>
                 <td>
@@ -84,6 +86,8 @@
                 [% END %]
                 </td>
               </tr>
+              [% END %]
+
               <tr>
                 <td class="tdkey">billing profile:</td>
                 <td>
diff --git a/root/tt/billing.tt b/root/tt/billing.tt
index d73c01d..cf0dc6f 100644
--- a/root/tt/billing.tt
+++ b/root/tt/billing.tt
@@ -1,3 +1,4 @@
+      [% IF Catalyst.config.product_features %]
         <h3 id="product">Products</h3>
 
         [% UNLESS Catalyst.session.admin.read_only %]
@@ -49,6 +50,8 @@
           </table>
         </div>
 
+      [% END %]
+
         <h3 id="bilprof">Billing Profiles</h3>
 
         [% UNLESS Catalyst.session.admin.read_only %]