diff --git a/app/assets/javascripts/templates/partials/enterprise_header.html.haml b/app/assets/javascripts/templates/partials/enterprise_header.html.haml
index 7b1fc74a03..cb41670831 100644
--- a/app/assets/javascripts/templates/partials/enterprise_header.html.haml
+++ b/app/assets/javascripts/templates/partials/enterprise_header.html.haml
@@ -1,7 +1,7 @@
 .highlight
   .highlight-top 
     %p.right
-      {{ [enterprise.address.city, enterprise.address.state] | printArray}}
+      {{ [enterprise.address.city, enterprise.address.state_name] | printArray}}
     %h3{"ng-if" => "enterprise.is_distributor"}
       %a{"bo-href" => "enterprise.path", "ofn-empties-cart" => "enterprise", bindonce: true}
         %i.ofn-i_040-hub
diff --git a/app/assets/javascripts/templates/partials/hub_actions.html.haml b/app/assets/javascripts/templates/partials/hub_actions.html.haml
index 2ed8bf3f65..54b8ee98b1 100644
--- a/app/assets/javascripts/templates/partials/hub_actions.html.haml
+++ b/app/assets/javascripts/templates/partials/hub_actions.html.haml
@@ -11,6 +11,6 @@
       %i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
       %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
       {{hub.name}} 
-      .button-address {{ hub.address.city }} , {{hub.address.state}}
+      .button-address {{ hub.address.city }} , {{hub.address.state_name}}
       %i.ofn-i_007-caret-right
 
diff --git a/app/assets/javascripts/templates/partials/hub_details.html.haml b/app/assets/javascripts/templates/partials/hub_details.html.haml
index 7273c5008a..8de1039f10 100644
--- a/app/assets/javascripts/templates/partials/hub_details.html.haml
+++ b/app/assets/javascripts/templates/partials/hub_details.html.haml
@@ -20,5 +20,5 @@
           %i.ofn-i_033-open-sign{"bo-if" => "enterprise.active"}
           %i.ofn-i_032-closed-sign{"bo-if" => "!enterprise.active"}
           {{enterprise.name}}
-          .button-address {{ enterprise.address.city }} , {{enterprise.address.state}}
+          .button-address {{ enterprise.address.city }} , {{enterprise.address.state_name}}
           %i.ofn-i_007-caret-right
diff --git a/spec/features/consumer/groups_spec.rb b/spec/features/consumer/groups_spec.rb
index 7baa5a2807..b2db10d58c 100644
--- a/spec/features/consumer/groups_spec.rb
+++ b/spec/features/consumer/groups_spec.rb
@@ -17,5 +17,6 @@ feature 'Groups', js: true do
     page.should have_content enterprise.name
     open_enterprise_modal enterprise
     modal_should_be_open_for enterprise
+    page.should have_content "Herndon, Vic"
   end
 end