diff --git a/src/components/flights/FlightsList.vue b/src/components/flights/FlightsList.vue
index 8979607..c27966e 100644
--- a/src/components/flights/FlightsList.vue
+++ b/src/components/flights/FlightsList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import {minutesToHumanReadable} from "src/composables/datetimeUtils";
-import {flightName} from "src/composables/objects/flight";
+import {flightName} from "src/composables/flight";
 import AvatarFromPhoto from "components/avatars/AvatarFromPhoto.vue";
 
 const props = defineProps({
diff --git a/src/composables/objects/flight.js b/src/composables/flight.js
similarity index 100%
rename from src/composables/objects/flight.js
rename to src/composables/flight.js
diff --git a/src/composables/objects/user.js b/src/composables/objects/user.js
deleted file mode 100644
index 49b42f7..0000000
--- a/src/composables/objects/user.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {ref} from "vue";
-import {useUserStore} from "stores/User";
-
-export const loading = ref(true);
-export const user = ref(null);
-export const fetchUser = (username) => {
-  loading.value = true;
-  return useUserStore().fetchDetail(username)
-    .then(respUser => {
-      user.value = respUser;
-      return respUser;
-    })
-    .finally(() => loading.value = false);
-};
diff --git a/src/layouts/PublicLayout.vue b/src/layouts/PublicLayout.vue
index e6eb116..f5654e2 100644
--- a/src/layouts/PublicLayout.vue
+++ b/src/layouts/PublicLayout.vue
@@ -38,6 +38,7 @@ import {useAppStore} from "stores/App";
 import {useMeta} from "quasar";
 import BreadcrumbsNavigation from "components/navigation/BreadcrumbsNavigation.vue";
 import AvatarFromPhoto from "components/avatars/AvatarFromPhoto.vue";
+import {useRoute} from "vue-router";
 
 const {pageTitle, breadcrumbs} = storeToRefs(useAppStore());
 const loggedUser = storeToRefs(useUserStore()).user;
diff --git a/src/pages/profile/aircraft/NewAircraftsPage.vue b/src/pages/profile/aircraft/NewAircraftsPage.vue
index eb89c84..b32ff24 100644
--- a/src/pages/profile/aircraft/NewAircraftsPage.vue
+++ b/src/pages/profile/aircraft/NewAircraftsPage.vue
@@ -5,16 +5,15 @@ import {useRouter} from "vue-router";
 import {useQuasar} from "quasar";
 import {useAppStore} from "stores/App";
 import {successObject} from "src/composables/dialog";
-import {fetchOrganizations} from "src/composables/objects/organization";
 import {onMounted} from "vue";
 import {storeToRefs} from "pinia";
-import {useUserStore} from "stores/User";
+import {useOrganizationsStore} from "stores/Organizations";
 
 const $q = useQuasar();
 const router = useRouter();
-const loggedUser = storeToRefs(useUserStore()).user;
 
 const handleSave = (formData) => {
+  delete formData.id;
   useAircraftsStore().create(formData).then(() => {
     $q.notify(successObject("Letadlo úspěšně vytvořeno"));
     router.push({name: "aircrafts"});
@@ -22,7 +21,7 @@ const handleSave = (formData) => {
 };
 
 onMounted(() => {
-  fetchOrganizations();
+  useOrganizationsStore().fetch();
   useAppStore().setPageTitle("Nové letadlo");
   useAppStore().setBreadcrumbs([
     {to: {name: "aircrafts"}, label: "Letadla"},
@@ -31,7 +30,7 @@ onMounted(() => {
 });
 
 const {isMutationRunning} = storeToRefs(useAircraftsStore());
-
+const {organizations} = storeToRefs(useOrganizationsStore());
 </script>
 
 <template>
@@ -39,7 +38,7 @@ const {isMutationRunning} = storeToRefs(useAircraftsStore());
     <q-card-section>
       <AircraftForm
         :is-request-pending="isMutationRunning"
-        :organizations="loggedUser.organizations"
+        :organizations="organizations"
         @save="handleSave"
       />
     </q-card-section>
diff --git a/src/pages/profile/flight/EditFlightPage.vue b/src/pages/profile/flight/EditFlightPage.vue
index eb6514a..4e71349 100644
--- a/src/pages/profile/flight/EditFlightPage.vue
+++ b/src/pages/profile/flight/EditFlightPage.vue
@@ -9,7 +9,7 @@ import {usePointsOfInterestStore} from "stores/PointsOfInterest";
 import {useAirportsStore} from "stores/Airports";
 import {useQuasar} from "quasar";
 import {storeToRefs} from "pinia";
-import {flightName} from "src/composables/objects/flight";
+import {flightName} from "src/composables/flight";
 import FlightFormCopilot from "components/flights/form/FlightFormCopilot.vue";
 import {useCopilotsStore} from "stores/Copilots";
 import FlightFormNotes from "components/flights/form/FlightFormNotes.vue";
diff --git a/src/pages/profile/flight/FlightDetailPage.vue b/src/pages/profile/flight/FlightDetailPage.vue
index 85d5497..ec8627c 100644
--- a/src/pages/profile/flight/FlightDetailPage.vue
+++ b/src/pages/profile/flight/FlightDetailPage.vue
@@ -2,7 +2,7 @@
 import {useRoute, useRouter} from "vue-router";
 import {computed, onMounted, ref, watch} from "vue";
 import FlightDetailSkeleton from "components/flights/FlightDetailSkeleton.vue";
-import {flightName} from "src/composables/objects/flight";
+import {flightName} from "src/composables/flight";
 import {useAppStore} from "stores/App";
 import FlightBasicInfo from "components/flights/FlightBasicInfo.vue";
 import {copyToClipboard, useQuasar} from "quasar";
diff --git a/src/pages/profile/flight/PhotoEditorPage.vue b/src/pages/profile/flight/PhotoEditorPage.vue
index aa98d33..4268ca0 100644
--- a/src/pages/profile/flight/PhotoEditorPage.vue
+++ b/src/pages/profile/flight/PhotoEditorPage.vue
@@ -3,7 +3,7 @@ import {useRoute} from "vue-router";
 import {onMounted, ref, watch} from "vue";
 import {usePhotosStore} from "stores/Photo";
 import {useAppStore} from "stores/App";
-import {flightName} from "src/composables/objects/flight";
+import {flightName} from "src/composables/flight";
 import VuePictureCropper from 'vue-picture-cropper';
 import {croppedAreaForPreview, getPreviewUrl} from "src/composables/photos/editor/preview";
 import {compare, onResize, splitter, splitterWidth} from "src/composables/photos/editor/splitter";
diff --git a/src/pages/profile/organization/OrganizationsPage.vue b/src/pages/profile/organization/OrganizationsPage.vue
index 128ef4c..4304087 100644
--- a/src/pages/profile/organization/OrganizationsPage.vue
+++ b/src/pages/profile/organization/OrganizationsPage.vue
@@ -21,11 +21,16 @@ const {isQueryRunning, organizations} = storeToRefs(useOrganizationsStore());
 </script>
 
 <template>
-  <BasicListSkeleton v-if="isQueryRunning"/>
-  <BasicInfoBanner v-else-if="!isQueryRunning && organizations.length === 0" :route-add='{name: "addOrganization"}'>
+  <BasicListSkeleton v-if="isQueryRunning || !organizations"/>
+
+  <BasicInfoBanner
+      v-else-if="!isQueryRunning && organizations.length === 0"
+      :route-add='{name: "addOrganization"}'
+  >
     Aktuálně nejsou dostupné žádné organizace, ke kterým by ses mohl/a přidat.
     Zaregistruj sem svůj aeroklub, abyste mohli sdílet letadla.
   </BasicInfoBanner>
+
   <OrganizationsList :items="organizations" :my-organizations-ids="myOrganizationIds" v-else/>
   <FAB :router-link="{name: 'addOrganization'}" mode="add"/>
 </template>
diff --git a/src/pages/profile/poi/NewPointOfInterestPage.vue b/src/pages/profile/poi/NewPointOfInterestPage.vue
index 684bc62..2630475 100644
--- a/src/pages/profile/poi/NewPointOfInterestPage.vue
+++ b/src/pages/profile/poi/NewPointOfInterestPage.vue
@@ -27,5 +27,5 @@ const {isMutationRunning} = storeToRefs(usePointsOfInterestStore());
 </script>
 
 <template>
-  <POIForm @save="handleSave" :is-request-pending="isMutationRunnin"/>
+  <POIForm @save="handleSave" :is-request-pending="isMutationRunning"/>
 </template>
diff --git a/src/pages/public/pilotProfile/FlightDetailPage.vue b/src/pages/public/pilotProfile/FlightDetailPage.vue
index 014d4ee..e5befc5 100644
--- a/src/pages/public/pilotProfile/FlightDetailPage.vue
+++ b/src/pages/public/pilotProfile/FlightDetailPage.vue
@@ -8,7 +8,7 @@ import FlightDetailSkeleton from "components/flights/FlightDetailSkeleton.vue";
 import PhotoGallery from "components/photos/PhotoGallery.vue";
 import {storeToRefs} from "pinia";
 import {useFlightsStore} from "stores/Flights";
-import {flightName} from "src/composables/objects/flight";
+import {flightName} from "src/composables/flight";
 
 const routeParams = useRoute().params;
 onMounted(() => {
diff --git a/src/stores/Events.js b/src/stores/Events.js
index 964a739..2acc2ad 100644
--- a/src/stores/Events.js
+++ b/src/stores/Events.js
@@ -4,7 +4,7 @@ import {mutate, query, updateInItems} from "stores/helpers";
 import {ref} from "vue";
 import {EVENT_DETAIL, EVENTS_LIST} from "src/graphql/queries/event";
 
-export const useEventsStore = defineStore('Copilots', () => {
+export const useEventsStore = defineStore('Events', () => {
   const event = ref(null);
   const events = ref([]);
   const isMutationRunning = ref(false);