diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53d2ac429..1416e9eb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog Fab-manager
 
+## v5.1.7 2021 August 24
+
+- Updated Norwegian language
+- Fix a bug: unable to show plans list page
+
 ## v5.1.6 2021 August 6
 
 - Adjuste packs pricing popover position
diff --git a/app/frontend/src/javascript/components/plans/plans-list.tsx b/app/frontend/src/javascript/components/plans/plans-list.tsx
index d764848ac..b9f485c4d 100644
--- a/app/frontend/src/javascript/components/plans/plans-list.tsx
+++ b/app/frontend/src/javascript/components/plans/plans-list.tsx
@@ -91,7 +91,7 @@ const PlansList: React.FC<PlansListProps> = ({ onError, onPlanSelection, onLogin
     const res = new Map<number, Map<number, Array<Plan>>>();
     for (const [groupId, plansByGroup] of byGroup) {
       const group = groups.find(g => g.id === groupId);
-      if (!group.disabled) {
+      if (group && !group.disabled) {
         res.set(groupId, groupBy(plansByGroup, 'plan_category_id'));
       }
     }
diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml
index 12996d1ae..b5acc400d 100644
--- a/config/locales/app.admin.no.yml
+++ b/config/locales/app.admin.no.yml
@@ -214,7 +214,7 @@
         passed_events: "Tidligere arragnementer"
         events_to_come: "Fremtidige arrangementer"
         events_to_come_asc: "Kommende arrangementer i kronologisk rekkefølge"
-        on_DATE: "på {DATE}"
+        on_DATE: "{DATE}"
         from_DATE: "fra {DATE}"
         from_TIME: "fra {TIME}"
         to_date: "til" #eg: from 01/01 to 01/05
diff --git a/config/locales/app.public.no.yml b/config/locales/app.public.no.yml
index 646ceb289..0c4fcb6f1 100644
--- a/config/locales/app.public.no.yml
+++ b/config/locales/app.public.no.yml
@@ -278,7 +278,7 @@
         sold_out: "Utsolgt"
         cancelled: "Avslyst"
         free_admission: "Gratis adgang"
-        still_available: "tilgjengelige sted(er)"
+        still_available: "ledig"
         without_reservation: "Uten reservasjon"
         add_an_event: "Legg til arrangement"
         load_the_next_events: "Last inn flere arrangementer..."