diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 581bd19..695bc5f 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -50,7 +50,7 @@
 </div>
 <% end %>
 
-<% unless profile.enabled? %>
+<% if profile.enterprise? and !profile.enabled? %>
   <div id='profile-disabled'>
     <%= environment.message_for_disabled_enterprise %>
   </div>
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
index b1804af..dd41ce4 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -1,4 +1,4 @@
-<% unless profile.enabled? %>
+<% if profile.enterprise? and !profile.enabled? %>
   <div id='profile-disabled'>
     <%= environment.message_for_disabled_enterprise %>
   </div>
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 0ce3430..a990964 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -266,4 +266,11 @@ class ContentViewerControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
   end
 
+  should 'not show message for disabled enterprise to non-enterprises' do
+    login_as(@profile.identifier)
+    @profile.enabled = false; @profile.save!
+    get :view_page, :profile => @profile.identifier, :page => []
+    assert_no_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
+  end
+
 end
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 2225a53..bf21053 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -213,13 +213,20 @@ class ProfileControllerTest < Test::Unit::TestCase
     assert_no_tag :tag => 'a', :content => 'Add friend'
   end
 
-  should 'show message for disabled enterprises' do
+  should 'show message for disabled enterprise' do
     login_as(@profile.identifier)
     ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
     get :index, :profile => ent.identifier
     assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
   end
 
+  should 'not show message for disabled enterprise to non-enterprises' do
+    login_as(@profile.identifier)
+    @profile.enabled = false; @profile.save!
+    get :index, :profile => @profile.identifier
+    assert_no_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
+  end
+
   should 'display "Products" link for enterprise' do
     ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
 
--
libgit2 0.21.2