diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb
index 49a49b3250..9fd20c1d78 100644
--- a/app/serializers/api/admin/enterprise_serializer.rb
+++ b/app/serializers/api/admin/enterprise_serializer.rb
@@ -4,6 +4,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
   attributes :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order
   attributes :preferred_product_selection_from_inventory_only
   attributes :owner, :users, :tag_groups, :default_tag_group
+  attributes :require_login
 
   has_one :owner, serializer: Api::Admin::UserSerializer
   has_many :users, serializer: Api::Admin::UserSerializer
diff --git a/app/views/admin/enterprises/form/_shop_preferences.html.haml b/app/views/admin/enterprises/form/_shop_preferences.html.haml
index 55d3777555..6573e4f3b4 100644
--- a/app/views/admin/enterprises/form/_shop_preferences.html.haml
+++ b/app/views/admin/enterprises/form/_shop_preferences.html.haml
@@ -40,20 +40,20 @@
       %div{'ofn-with-tip' => t('.shopfront_requires_login_tip')}
         %a= t 'admin.whats_this'
     .three.columns
-      = f.radio_button :require_login, false
+      = f.radio_button :require_login, false, "ng-model" => "Enterprise.require_login", "ng-value" => "false"
       = f.label :require_login, t('.shopfront_requires_login_false'), value: :false
     .five.columns.omega
-      = f.radio_button :require_login, true
+      = f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true"
       = f.label :require_login, t('.shopfront_requires_login_true'), value: :true
-.row
+.row{ng: {if: "!Enterprise.require_login"}}
   .alpha.eleven.columns
     .three.columns.alpha
       %label= t '.allow_guest_orders'
       %div{'ofn-with-tip' => t('.allow_guest_orders_tip')}
         %a= t 'admin.whats_this'
     .three.columns
-      = f.radio_button :allow_guest_orders, false
-      = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
-    .five.columns.omega
       = f.radio_button :allow_guest_orders, true
       = f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true
+    .five.columns.omega
+      = f.radio_button :allow_guest_orders, false
+      = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 808f36c533..20cc39e0d8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -197,14 +197,14 @@ en:
         manage: Manage
       form:
         shop_preferences:
-          shopfront_requires_login: "Shopfront requires login?"
-          shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
+          shopfront_requires_login: "Publicly visible shopfront?"
+          shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
           shopfront_requires_login_false: "Public"
-          shopfront_requires_login_true: "Require customers to login"
+          shopfront_requires_login_true: "Visible to registered customers only"
           allow_guest_orders: "Guest orders"
           allow_guest_orders_tip: "Allow checkout as guest or require a registered user."
           allow_guest_orders_false: "Require login to order"
-          allow_guest_orders_true: "Allow checkout as guest"
+          allow_guest_orders_true: "Allow guest checkout"
 
   home:
     hubs:
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 27c04316ca..b436c0c3ee 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -85,14 +85,12 @@ feature %q{
     page.should have_selector '.available'
     choose 'Own'
 
-    # Require login to view shopfront
+    # Require login to view shopfront or for checkout
     within(".side_menu") { click_link "Shop Preferences" }
     expect(page).to have_checked_field "enterprise_require_login_false"
-    choose "Require customers to login"
-
-    # Require login for checkout
     expect(page).to have_checked_field "enterprise_allow_guest_orders_true"
-    choose "Require login to order"
+    choose "Visible to registered customers only"
+    expect(page).to have_no_checked_field "enterprise_require_login_false"
 
     within (".side_menu") { click_link "Users" }
     select2_search user.email, from: 'Owner'
@@ -195,7 +193,6 @@ feature %q{
     page.should have_content 'This is my shopfront message.'
     page.should have_checked_field "enterprise_preferred_shopfront_order_cycle_order_orders_open_at"
     expect(page).to have_checked_field "enterprise_require_login_true"
-    expect(page).to have_checked_field "enterprise_allow_guest_orders_false"
   end
 
   describe "producer properties" do