                            (congregation/get-unrestricted-congregation state cong-id))]
         (when-not congregation
           (forbidden! "No demo congregation"))
-        (ok (-> (fetch-congregation conn state user-id congregation)
+        (ok (-> congregation
+                (merge-congregation-details state user-id)
+                (enrich-congregation conn)
                 (assoc :id "demo")
                 (assoc :name "Demo Congregation")
                 (assoc :permissions {:viewCongregation true})

     :congregation-boundaries (sequence (vals (get-in state [::congregation-boundary/congregation-boundaries cong-id])))
     :regions (sequence (vals (get-in state [::region/regions cong-id])))
     :card-minimap-viewports (sequence (vals (get-in state [::card-minimap-viewport/card-minimap-viewports cong-id])))
     :users (->> (user/get-users conn {:ids (congregation/get-users state cong-id)})
                 (map (fn [user]
                        (-> (:user/attributes user)
                            (assoc :id (:user/id user))
                            (assoc :sub (:user/subject user))))))}))

(def ^:private validate-congregation (s/validator Congregation))


              congregation (congregation/get-my-congregation state cong-id user-id)]
          (when-not congregation
            (forbidden! "No congregation access"))
          (ok (-> congregation
                  (merge-congregation-details state user-id)
                  (enrich-congregation conn)
                  (format-for-api)
                  (validate-congregation))))))))

