diff --git a/Cargo.lock b/Cargo.lock
index 7a1695e0a..6ba272dd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -875,9 +875,12 @@ dependencies = [
 
 [[package]]
 name = "ic-stable-structures"
-version = "0.6.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4867a1d9f232e99ca68682161d1fc67dff9501f4f1bf42d69a9358289ad0f8"
+checksum = "07e2282054c8ddf0cb2a7abf5c174c373917b4345c9a096ae4aa7f7185cdcdc7"
+dependencies = [
+ "ic_principal",
+]
 
 [[package]]
 name = "ic0"
diff --git a/Cargo.toml b/Cargo.toml
index 0c7ed822a..169a19a5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ ic-cdk = "0.13.1"
 ic-cdk-macros = "0.9"
 ic-cdk-timers = "0.7.0"
 ic-ledger-types = "0.10.0"
-ic-stable-structures = "0.6.0"
+ic-stable-structures = "0.6.4"
 lazy_static = "1.4.0"
 mockall = "0.12.1"
 num-bigint = "0.4"
diff --git a/apps/wallet/src/components/accounts/TransferDialog.vue b/apps/wallet/src/components/accounts/TransferDialog.vue
index 1a07c5fb5..6e10aea99 100644
--- a/apps/wallet/src/components/accounts/TransferDialog.vue
+++ b/apps/wallet/src/components/accounts/TransferDialog.vue
@@ -35,7 +35,7 @@
             <VCol :cols="12">
               <VTextField
                 v-model="summary"
-                :label="$t('terms.summary')"
+                :label="$t('terms.comment_optional')"
                 density="comfortable"
                 class="mb-2"
                 name="to"
diff --git a/apps/wallet/src/components/add-station/DeployStation.spec.ts b/apps/wallet/src/components/add-station/DeployStation.spec.ts
index 97107ae27..30c7f9499 100644
--- a/apps/wallet/src/components/add-station/DeployStation.spec.ts
+++ b/apps/wallet/src/components/add-station/DeployStation.spec.ts
@@ -5,6 +5,7 @@ import { services } from '~/plugins/services.plugin';
 import { flushPromises } from '@vue/test-utils';
 import { CanDeployStationResponse, User } from '~/generated/control-panel/control_panel.did';
 import { Principal } from '@dfinity/principal';
+import { StationService } from '~/services/station.service';
 
 vi.mock('~/utils/helper.utils', async importOriginal => {
   const mod = (await importOriginal()) as object;
@@ -22,6 +23,18 @@ vi.mock('~/stores/station.store', async importOriginal => {
   };
 });
 
+vi.mock('~/services/station.service', () => {
+  const mock: Partial<StationService> = {
+    withStationId: vi.fn().mockReturnThis(),
+    capabilities: vi.fn().mockImplementation(() => Promise.resolve({})),
+    isHealthy: vi.fn().mockResolvedValue(true),
+  };
+
+  return {
+    StationService: vi.fn(() => mock),
+  };
+});
+
 describe('DeployStation', () => {
   it('renders correctly', () => {
     vi.spyOn(services().controlPanel, 'canDeployStation').mockResolvedValueOnce(
@@ -95,7 +108,7 @@ describe('DeployStation', () => {
     expect(wrapper.find('[data-test-id="deploy-quota-exceeded-error"]').exists()).toBe(true);
   });
 
-  it('will show the deploy screen if the is approved to create a new wallet', async () => {
+  it('will show the deploy screen if the user is approved to create a new wallet', async () => {
     vi.spyOn(services().controlPanel, 'canDeployStation').mockResolvedValue({
       Allowed: BigInt(10),
     } as CanDeployStationResponse);
@@ -111,6 +124,18 @@ describe('DeployStation', () => {
 
     await flushPromises();
 
+    const form = wrapper.find('[data-test-id="deploy-station-form"]');
+
+    form.find('input[name="station_name"]').setValue('test');
+    form.find('input[name="admin_name"]').setValue('admin');
+
+    await flushPromises();
+
+    form.trigger('submit');
+
+    await wrapper.vm.$nextTick();
+    await flushPromises();
+
     expect(wrapper.find('[data-test-id="deploying-station"]').exists()).toBe(true);
 
     // will redirect after deploy is complete
diff --git a/apps/wallet/src/components/add-station/DeployStation.vue b/apps/wallet/src/components/add-station/DeployStation.vue
index b9f5f3969..8ee871ed7 100644
--- a/apps/wallet/src/components/add-station/DeployStation.vue
+++ b/apps/wallet/src/components/add-station/DeployStation.vue
@@ -31,7 +31,7 @@
         type="email"
         :rules="[requiredRule, validEmail]"
         :label="$t('pages.add_station.join_waitlist_email_field')"
-        :variant="'outlined'"
+        variant="filled"
         hide-details="auto"
         :disabled="working"
         data-test-id="join-waitlist-form-email"
@@ -49,6 +49,57 @@
       </div>
     </VForm>
 
+    <VForm
+      v-else-if="canDeployStatus === CanDeployStatus.PickName"
+      ref="stationForm"
+      class="mt-12"
+      data-test-id="deploy-station-form"
+      @submit.prevent="stationFormSubmit"
+    >
+      <h2 class="mb-6 text-h4">
+        {{ $t('pages.add_station.station_title') }}
+      </h2>
+      <p class="text-body-1 mb-6">
+        {{ $t('pages.add_station.station_body') }}
+      </p>
+
+      <VTextField
+        v-model.trim="stationName"
+        type="text"
+        name="station_name"
+        :rules="[requiredRule, maxLengthRule(40, $t('pages.add_station.station_name_field'))]"
+        :label="$t('pages.add_station.station_name_field')"
+        variant="filled"
+        hide-details="auto"
+        :disabled="working"
+        data-test-id="deploy-station-form-name-field"
+      />
+
+      <VTextField
+        v-model.trim="adminName"
+        type="text"
+        name="admin_name"
+        class="mt-4"
+        :rules="[requiredRule, maxLengthRule(50, $t('pages.add_station.admin_name_field'))]"
+        :label="$t('pages.add_station.admin_name_field')"
+        variant="filled"
+        hide-details="auto"
+        :disabled="working"
+        data-test-id="deploy-station-form-admin-name-field"
+      />
+
+      <div class="d-flex align-center ga-4 mt-6">
+        <VBtn
+          color="primary"
+          type="submit"
+          :loading="working"
+          :disabled="working || !isStationFormValid"
+        >
+          {{ $t('terms.create') }}
+        </VBtn>
+      </div>
+    </VForm>
+
     <div
       v-else-if="canDeployStatus === CanDeployStatus.InWaitingList"
       class="mt-12"
@@ -129,6 +180,7 @@ import { useAppStore } from '~/stores/app.store';
 import { useSessionStore } from '~/stores/session.store';
 import { createUserInitialAccount, useStationStore } from '~/stores/station.store';
 import { VFormValidation } from '~/types/helper.types';
+import { maxLengthRule } from '~/utils/form.utils';
 import { requiredRule, validEmail } from '~/utils/form.utils';
 import { unreachable, variantIs, wait } from '~/utils/helper.utils';
 
@@ -140,6 +192,7 @@ enum CanDeployStatus {
   NotAllowed = 'not_allowed',
   Approved = 'approved',
   QuotaExceeded = 'quota_exceeded',
+  PickName = 'pick_name',
 }
 const canDeployStatus = ref<CanDeployStatus>(CanDeployStatus.CheckPermissions);
 
@@ -169,6 +222,11 @@ const working = ref(false);
 const form = ref<VFormValidation | null>(null);
 const isFormValid = computed(() => (form.value ? form.value.isValid : false));
 
+const stationName = ref('');
+const adminName = ref('');
+const stationForm = ref<VFormValidation | null>(null);
+const isStationFormValid = computed(() => (stationForm.value ? stationForm.value.isValid : false));
+
 const waitUntilStationIsInitialized = async (
   stationId: Principal,
   { retries, retryWaitMs }: { retries?: number; retryWaitMs?: number } = {},
@@ -201,7 +259,10 @@ const waitUntilStationIsInitialized = async (
 const deployInitialStation = async (): Promise<void> => {
   try {
     deploymentStatus.value = DeployStationStatus.Deploying;
-    const stationId = await controlPanelService.deployStation();
+    const stationId = await controlPanelService.deployStation({
+      station_name: stationName.value,
+      admin_name: adminName.value,
+    });
     const controlPanelUser = await controlPanelService.getCurrentUser();
 
     // wait for the station to be initialized, this requires one round of consensus
@@ -242,14 +303,25 @@ async function joinWaitlist() {
   }
 }
 
+async function stationFormSubmit() {
+  deploymentStatus.value = DeployStationStatus.Starting;
+  canDeployStatus.value = CanDeployStatus.Approved;
+
+  try {
+    await deployInitialStation();
+  } catch (e: unknown) {
+    app.sendErrorNotification(e);
+    deploymentStatus.value = DeployStationStatus.Failed;
+  }
+}
+
 onMounted(async () => {
   try {
     const canDeploy = await controlPanelService.canDeployStation();
 
     if (variantIs(canDeploy, 'NotAllowed')) {
       if (variantIs(canDeploy.NotAllowed, 'Approved')) {
-        deploymentStatus.value = DeployStationStatus.Starting;
-        canDeployStatus.value = CanDeployStatus.Approved;
+        canDeployStatus.value = CanDeployStatus.PickName;
         await deployInitialStation();
       } else if (variantIs(canDeploy.NotAllowed, 'Denylisted')) {
         canDeployStatus.value = CanDeployStatus.NotAllowed;
@@ -265,9 +337,7 @@ onMounted(async () => {
     }
 
     if (variantIs(canDeploy, 'Allowed')) {
-      deploymentStatus.value = DeployStationStatus.Starting;
-      canDeployStatus.value = CanDeployStatus.Approved;
-      await deployInitialStation();
+      canDeployStatus.value = CanDeployStatus.PickName;
 
       return;
     }
diff --git a/apps/wallet/src/components/add-station/JoinStation.spec.ts b/apps/wallet/src/components/add-station/JoinStation.spec.ts
index a52291374..e5510ed9e 100644
--- a/apps/wallet/src/components/add-station/JoinStation.spec.ts
+++ b/apps/wallet/src/components/add-station/JoinStation.spec.ts
@@ -4,6 +4,22 @@ import JoinStation from './JoinStation.vue';
 import { useSessionStore } from '~/stores/session.store';
 import { flushPromises } from '@vue/test-utils';
 import { useAppStore } from '~/stores/app.store';
+import { StationService } from '~/services/station.service';
+
+vi.mock('~/services/station.service', () => {
+  const mock: Partial<StationService> = {
+    withStationId: vi.fn().mockReturnThis(),
+    capabilities: vi.fn().mockImplementation(() =>
+      Promise.resolve({
+        name: 'test',
+      }),
+    ),
+  };
+
+  return {
+    StationService: vi.fn(() => mock),
+  };
+});
 
 describe('JoinStation', () => {
   it('renders correctly', () => {
@@ -45,16 +61,16 @@ describe('JoinStation', () => {
 
     const canisterId = wrapper.find('[data-test-id="join-station-form-canister-id"] input');
 
-    // name is optional
-    expect(
-      wrapper.find('[data-test-id="join-station-form-canister-name"]').classes(),
-    ).not.toContain('v-input--error');
-
     // canister id is required
     expect(wrapper.find('[data-test-id="join-station-form-canister-id"]').classes()).toContain(
       'v-input--error',
     );
 
+    // name is required
+    expect(wrapper.find('[data-test-id="join-station-form-canister-name"]').classes()).toContain(
+      'v-input--error',
+    );
+
     await canisterId.setValue('hello');
     await flushPromises();
 
diff --git a/apps/wallet/src/components/add-station/JoinStation.vue b/apps/wallet/src/components/add-station/JoinStation.vue
index d0c4822bc..6dde3701a 100644
--- a/apps/wallet/src/components/add-station/JoinStation.vue
+++ b/apps/wallet/src/components/add-station/JoinStation.vue
@@ -34,6 +34,7 @@
         v-model.trim="name"
         :label="$t('pages.add_station.join_station_name')"
         data-test-id="join-station-form-canister-name"
+        :rules="[requiredRule, maxLengthRule(40, $t('pages.add_station.join_station_name'))]"
         variant="outlined"
         :disabled="working"
       />
@@ -59,11 +60,16 @@ import { VFormValidation } from '~/types/helper.types';
 import { useSessionStore } from '~/stores/session.store';
 import { ref } from 'vue';
 import { computed } from 'vue';
-import { requiredRule, validCanisterId } from '~/utils/form.utils';
+import { maxLengthRule, requiredRule, validCanisterId } from '~/utils/form.utils';
 import { useRouter } from 'vue-router';
 import { defaultHomeRoute } from '~/configs/routes.config';
 import { useAppStore } from '~/stores/app.store';
 import { copyToClipboard } from '~/utils/app.utils';
+import { StationService } from '~/services/station.service';
+import { icAgent } from '~/core/ic-agent.core';
+import { Principal } from '@dfinity/principal';
+import logger from '~/core/logger.core';
+import { watch } from 'vue';
 
 const session = useSessionStore();
 const router = useRouter();
@@ -75,11 +81,40 @@ const name = ref('');
 
 const form = ref<VFormValidation | null>(null);
 const isFormValid = computed(() => (form.value ? form.value.isValid : false));
+const stationService = new StationService(icAgent.get());
 
 const emit = defineEmits<{
   (event: 'back', payload: void): void;
 }>();
 
+const maybeParseCanisterId = (canisterId: string): Principal | undefined => {
+  try {
+    return Principal.fromText(canisterId);
+  } catch {
+    return undefined;
+  }
+};
+
+const onChangeCanisterIdMaybeFetchName = async () => {
+  let stationId = maybeParseCanisterId(canisterId.value);
+  if (!stationId) {
+    return;
+  }
+
+  try {
+    const station = await stationService.withStationId(stationId).capabilities();
+
+    name.value = station.name;
+  } catch (e: unknown) {
+    logger.warn('Failed to fetch station name', e);
+  }
+};
+
+watch(
+  () => canisterId.value,
+  () => onChangeCanisterIdMaybeFetchName(),
+);
+
 async function addNewStation() {
   if (working.value) {
     return;
diff --git a/apps/wallet/src/components/inputs/UserAutocomplete.vue b/apps/wallet/src/components/inputs/UserAutocomplete.vue
index 372075074..8eca27836 100644
--- a/apps/wallet/src/components/inputs/UserAutocomplete.vue
+++ b/apps/wallet/src/components/inputs/UserAutocomplete.vue
@@ -91,7 +91,7 @@ watch(
   results => {
     const updatedItems = results.map(result => ({
       value: result.id,
-      text: result.name?.[0] ?? result.id,
+      text: result.name,
     }));
 
     updateAvailableItemsList(updatedItems);
diff --git a/apps/wallet/src/components/permissions/IndividualUserPermissions.vue b/apps/wallet/src/components/permissions/IndividualUserPermissions.vue
index a5375c7a5..b4ec613a2 100644
--- a/apps/wallet/src/components/permissions/IndividualUserPermissions.vue
+++ b/apps/wallet/src/components/permissions/IndividualUserPermissions.vue
@@ -75,7 +75,7 @@ const { fetchPolicies } = toRefs(props);
 
 const userList = computed(() => {
   const users = autocomplete.results.value.map(user => ({
-    title: user.name?.[0] ? user.name[0] : user.id,
+    title: user.name,
     value: user.id,
   }));
 
diff --git a/apps/wallet/src/components/permissions/SpecificUsersForm.vue b/apps/wallet/src/components/permissions/SpecificUsersForm.vue
index ce7f6411f..73fe7e2cb 100644
--- a/apps/wallet/src/components/permissions/SpecificUsersForm.vue
+++ b/apps/wallet/src/components/permissions/SpecificUsersForm.vue
@@ -64,14 +64,14 @@ const model = computed({
 
 const userList = computed(() => {
   const users = usersAutocomplete.results.value.map(user => ({
-    title: user.name?.[0] ? user.name[0] : user.id,
+    title: user.name,
     value: user.id,
   }));
 
   (model.value.prefilledUsers ?? []).forEach(user => {
     if (!users.find(g => g.value === user.id)) {
       users.push({
-        title: user.name?.[0] ? user.name[0] : user.id,
+        title: user.name,
         value: user.id,
       });
     }
diff --git a/apps/wallet/src/components/requests/RequestDetailView.spec.ts b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
index e3ab0f19b..9387e4bac 100644
--- a/apps/wallet/src/components/requests/RequestDetailView.spec.ts
+++ b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
@@ -7,8 +7,8 @@ type RequestDetailViewProps = InstanceType<typeof RequestDetailView>['$props'];
 const pendingProps: RequestDetailViewProps = {
   details: {
     can_approve: true,
-    requester_name: undefined,
-    approvers: [{ id: 'requester-id', name: [] }],
+    requester_name: 'requester',
+    approvers: [{ id: 'requester-id', name: '' }],
   },
   request: {
     status: { Created: null },
@@ -26,7 +26,7 @@ const pendingProps: RequestDetailViewProps = {
         input: {
           groups: [],
           identities: [],
-          name: ['test'],
+          name: 'test',
           status: { Active: null },
         },
       },
@@ -44,10 +44,10 @@ const pendingProps: RequestDetailViewProps = {
 const approvedProps: RequestDetailViewProps = {
   details: {
     can_approve: false,
-    requester_name: undefined,
+    requester_name: 'requester',
     approvers: [
-      { id: 'approver-1-id', name: [] },
-      { id: 'approver-2-id', name: [] },
+      { id: 'approver-1-id', name: '' },
+      { id: 'approver-2-id', name: '' },
     ],
   },
   request: {
@@ -72,7 +72,7 @@ const approvedProps: RequestDetailViewProps = {
         input: {
           groups: [],
           identities: [],
-          name: ['test'],
+          name: 'test',
           status: { Active: null },
         },
       },
@@ -90,10 +90,10 @@ const approvedProps: RequestDetailViewProps = {
 const rejectedProps: RequestDetailViewProps = {
   details: {
     can_approve: false,
-    requester_name: undefined,
+    requester_name: 'requester',
     approvers: [
-      { id: 'approver-1-id', name: [] },
-      { id: 'approver-2-id', name: [] },
+      { id: 'approver-1-id', name: '' },
+      { id: 'approver-2-id', name: '' },
     ],
   },
   request: {
@@ -118,7 +118,7 @@ const rejectedProps: RequestDetailViewProps = {
         input: {
           groups: [],
           identities: [],
-          name: ['test'],
+          name: 'test',
           status: { Active: null },
         },
       },
diff --git a/apps/wallet/src/components/requests/RequestDetailView.vue b/apps/wallet/src/components/requests/RequestDetailView.vue
index db004b82c..06053d92f 100644
--- a/apps/wallet/src/components/requests/RequestDetailView.vue
+++ b/apps/wallet/src/components/requests/RequestDetailView.vue
@@ -74,7 +74,7 @@
       <tbody>
         <tr v-for="approval in approvals" :key="approval.approver?.id">
           <td>
-            {{ approval.approver.name?.[0] || approval.approver.id }}
+            {{ approval.approver.name || approval.approver.id }}
           </td>
           <td>
             <RequestApprovalStatusChip
@@ -275,7 +275,7 @@ const approvals = computed(() =>
     return {
       approver: approver || {
         id: approval.approver_id,
-        name: [],
+        name: '',
       },
       approval,
     };
diff --git a/apps/wallet/src/components/requests/RequestDialog.spec.ts b/apps/wallet/src/components/requests/RequestDialog.spec.ts
index 617ab6200..eb8b93429 100644
--- a/apps/wallet/src/components/requests/RequestDialog.spec.ts
+++ b/apps/wallet/src/components/requests/RequestDialog.spec.ts
@@ -48,7 +48,7 @@ const approvableRequestResponse = {
   },
   additional_info: {
     id: 'requesterid',
-    requester_name: [],
+    requester_name: '',
   },
   //...
 } as ExtractOk<GetRequestResult>;
@@ -63,7 +63,7 @@ const nextApprovableRequestResponse = {
   },
   additional_info: {
     id: 'next-id',
-    requester_name: [],
+    requester_name: '',
   },
   //...
 } as GetRequestResultData;
@@ -78,7 +78,7 @@ const completedRequestResponse = {
   },
   additional_info: {
     id: 'first-id',
-    requester_name: [],
+    requester_name: '',
   },
   //...
 } as ExtractOk<GetRequestResult>;
diff --git a/apps/wallet/src/components/requests/RequestDialog.vue b/apps/wallet/src/components/requests/RequestDialog.vue
index 7b5d22a7d..a0d5f2a4b 100644
--- a/apps/wallet/src/components/requests/RequestDialog.vue
+++ b/apps/wallet/src/components/requests/RequestDialog.vue
@@ -28,7 +28,7 @@
         :request="data.request"
         :details="{
           can_approve: data.privileges.can_approve,
-          requester_name: data.additionalInfo.requester_name[0],
+          requester_name: data.additionalInfo.requester_name,
           approvers: data.additionalInfo.approvers,
         }"
         :loading="approving || loading"
diff --git a/apps/wallet/src/components/requests/RequestList.vue b/apps/wallet/src/components/requests/RequestList.vue
index 8c96f17e0..d8d25f7f8 100644
--- a/apps/wallet/src/components/requests/RequestList.vue
+++ b/apps/wallet/src/components/requests/RequestList.vue
@@ -72,7 +72,7 @@ const getDetails = (request: Request): RequestDetails => {
 
   return {
     can_approve: !!privileges?.can_approve,
-    requester_name: info?.requester_name?.[0] ?? '',
+    requester_name: info?.requester_name ?? '',
     approvers: info?.approvers ?? [],
   };
 };
diff --git a/apps/wallet/src/components/requests/RequestMetadata.spec.ts b/apps/wallet/src/components/requests/RequestMetadata.spec.ts
index 2d41f29e9..6a0f0b63c 100644
--- a/apps/wallet/src/components/requests/RequestMetadata.spec.ts
+++ b/apps/wallet/src/components/requests/RequestMetadata.spec.ts
@@ -7,7 +7,7 @@ describe('RequestMetadata', () => {
   it('renders properly', () => {
     const wrapper = mount(RequestMetadata, {
       props: {
-        details: { can_approve: false, requester_name: undefined, approvers: [] },
+        details: { can_approve: false, requester_name: 'requester', approvers: [] },
         request: {
           status: { Approved: null },
         } as Request,
@@ -20,7 +20,7 @@ describe('RequestMetadata', () => {
   it('shows the expiration_dt when still pending', () => {
     const wrapper = mount(RequestMetadata, {
       props: {
-        details: { can_approve: false, requester_name: undefined, approvers: [] },
+        details: { can_approve: false, requester_name: 'requester', approvers: [] },
         request: {
           expiration_dt: new Date().toISOString(),
           status: { Created: null },
@@ -35,7 +35,7 @@ describe('RequestMetadata', () => {
   it('hides the expiration_dt when not pending', () => {
     const wrapper = mount(RequestMetadata, {
       props: {
-        details: { can_approve: false, requester_name: undefined, approvers: [] },
+        details: { can_approve: false, requester_name: 'requester', approvers: [] },
         request: {
           expiration_dt: new Date().toISOString(),
           status: { Approved: null },
diff --git a/apps/wallet/src/components/requests/RequestMetadata.vue b/apps/wallet/src/components/requests/RequestMetadata.vue
index 9e8464dd6..39d8d5de0 100644
--- a/apps/wallet/src/components/requests/RequestMetadata.vue
+++ b/apps/wallet/src/components/requests/RequestMetadata.vue
@@ -10,16 +10,12 @@
           data-test-id="requested_by"
         >
           <span class="text-no-wrap text-truncate" style="max-width: 80px">
-            {{
-              props.details.requester_name
-                ? props.details.requester_name
-                : props.request.requested_by
-            }}
+            {{ props.details.requester_name }}
           </span>
         </VChip>
       </template>
       <span>
-        {{ $t('requests.requested_by', { name: props.details.requester_name ?? '-' }) }}
+        {{ $t('requests.requested_by', { name: props.details.requester_name }) }}
         <br />
         {{ $t('requests.requester_id', { id: props.request.requested_by }) }}
       </span>
diff --git a/apps/wallet/src/components/requests/operations/AddUserOperation.vue b/apps/wallet/src/components/requests/operations/AddUserOperation.vue
index ab769fb54..b6718c2b3 100644
--- a/apps/wallet/src/components/requests/operations/AddUserOperation.vue
+++ b/apps/wallet/src/components/requests/operations/AddUserOperation.vue
@@ -3,7 +3,7 @@
     <RequestOperationListRow v-if="formValue.name">
       <template #name>{{ $t('terms.name') }}</template>
       <template #content>
-        {{ formValue.name?.[0] ?? '-' }}
+        {{ formValue.name }}
       </template>
     </RequestOperationListRow>
     <RequestOperationListRow v-if="formValue.status">
diff --git a/apps/wallet/src/components/requests/operations/EditUserOperation.vue b/apps/wallet/src/components/requests/operations/EditUserOperation.vue
index 20b7afd4c..2a106f379 100644
--- a/apps/wallet/src/components/requests/operations/EditUserOperation.vue
+++ b/apps/wallet/src/components/requests/operations/EditUserOperation.vue
@@ -9,7 +9,7 @@
     <RequestOperationListRow v-if="formValue.name">
       <template #name>{{ $t('terms.name') }}</template>
       <template #content>
-        {{ formValue.name?.[0] ?? '-' }}
+        {{ formValue.name }}
       </template>
     </RequestOperationListRow>
     <RequestOperationListRow v-if="formValue.status">
@@ -46,7 +46,7 @@ const formValue: Ref<Partial<User>> = ref({});
 onBeforeMount(() => {
   const user: Partial<User> = {};
   user.id = props.operation.input.id;
-  user.name = props.operation.input.name;
+  user.name = props.operation.input.name?.[0];
   if (props.operation.input.status?.[0]) {
     user.status = props.operation.input.status?.[0];
   }
diff --git a/apps/wallet/src/components/settings/StationInfoCard.spec.ts b/apps/wallet/src/components/settings/StationInfoCard.spec.ts
index 84719f064..207647189 100644
--- a/apps/wallet/src/components/settings/StationInfoCard.spec.ts
+++ b/apps/wallet/src/components/settings/StationInfoCard.spec.ts
@@ -18,7 +18,7 @@ vi.mock('~/services/control-panel.service', () => {
 });
 
 describe('StationInfoCard', () => {
-  function initStation(principal: Principal, isMain: boolean, name: string | null) {
+  function initStation(principal: Principal, isMain: boolean, name: string) {
     const stationStore = useStationStore();
     const sessionStore = useSessionStore();
 
@@ -31,7 +31,7 @@ describe('StationInfoCard', () => {
     stationStore.$patch({ canisterId: principal.toText() });
   }
 
-  function addStation(principal: Principal, isMain: boolean, name: string | null) {
+  function addStation(principal: Principal, isMain: boolean, name: string) {
     const sessionStore = useSessionStore();
     const stationStore = useStationStore();
 
@@ -128,7 +128,7 @@ describe('StationInfoCard', () => {
           [
             {
               canister_id: stationCanisterId1,
-              name: ['TEST WALLET'],
+              name: 'TEST WALLET',
             },
           ],
         ],
diff --git a/apps/wallet/src/components/settings/StationInfoCard.vue b/apps/wallet/src/components/settings/StationInfoCard.vue
index 090013d2d..b28969b1c 100644
--- a/apps/wallet/src/components/settings/StationInfoCard.vue
+++ b/apps/wallet/src/components/settings/StationInfoCard.vue
@@ -182,13 +182,13 @@ const save = async ({ model }: { valid: boolean; model: StationInfoModel }): Pro
     session.data.stations.map(entry => {
       if (entry.canisterId === station.canisterId) {
         return {
-          name: model.name ? [model.name] : [],
+          name: model.name,
           canister_id: Principal.fromText(entry.canisterId),
         };
       }
 
       return {
-        name: entry.name ? [entry.name] : [],
+        name: entry.name,
         canister_id: Principal.fromText(entry.canisterId),
       };
     }) ?? [];
diff --git a/apps/wallet/src/components/users/UserDialog.vue b/apps/wallet/src/components/users/UserDialog.vue
index 470fd45f4..087ab7c20 100644
--- a/apps/wallet/src/components/users/UserDialog.vue
+++ b/apps/wallet/src/components/users/UserDialog.vue
@@ -141,7 +141,7 @@ const save = async (): Promise<void> => {
         id: user.value.id,
         groups: [assertAndReturn(user.value.groups, 'groups').map(g => g.id)],
         identities: [assertAndReturn(user.value.identities, 'identities')],
-        name: user.value.name !== undefined ? user.value.name : [],
+        name: [assertAndReturn(user.value.name, 'name')],
         status: [assertAndReturn(user.value.status, 'status')],
       });
 
@@ -154,7 +154,7 @@ const save = async (): Promise<void> => {
     const request = await station.service.addUser({
       groups: assertAndReturn(user.value.groups, 'groups').map(g => g.id),
       identities: assertAndReturn(user.value.identities, 'identities'),
-      name: user.value.name !== undefined ? user.value.name : [],
+      name: assertAndReturn(user.value.name, 'name'),
       status: assertAndReturn(user.value.status, 'status'),
     });
 
diff --git a/apps/wallet/src/components/users/UserForm.spec.ts b/apps/wallet/src/components/users/UserForm.spec.ts
index 48564b6eb..627d2b343 100644
--- a/apps/wallet/src/components/users/UserForm.spec.ts
+++ b/apps/wallet/src/components/users/UserForm.spec.ts
@@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest';
 import { mount } from '~/test.utils';
 import UserForm from './UserForm.vue';
 
-describe('AddPrincipalForm', () => {
+describe('UserForm', () => {
   it('renders properly', () => {
     const wrapper = mount(UserForm, {
       props: {
@@ -30,7 +30,7 @@ describe('AddPrincipalForm', () => {
     await nameInput.setValue('Test');
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-    expect(wrapper.emitted('update:modelValue')).toEqual([[{ name: ['Test'] }]]);
+    expect(wrapper.emitted('update:modelValue')).toEqual([[{ name: 'Test' }]]);
   });
 
   it('submits the form and emits it', async () => {
@@ -58,7 +58,7 @@ describe('AddPrincipalForm', () => {
     expect(wrapper.emitted('submit')).toEqual([
       [
         {
-          name: ['Test'],
+          name: 'Test',
           groups: [{ id: '1', name: 'test' }],
           identities: [Principal.anonymous()],
           status: { Active: null },
diff --git a/apps/wallet/src/components/users/UserForm.vue b/apps/wallet/src/components/users/UserForm.vue
index c49523984..d124af2f3 100644
--- a/apps/wallet/src/components/users/UserForm.vue
+++ b/apps/wallet/src/components/users/UserForm.vue
@@ -14,7 +14,7 @@
       name="name"
       :label="$t('terms.name')"
       density="comfortable"
-      :rules="[maxLengthRule(100, $t('terms.name'))]"
+      :rules="[maxLengthRule(50, $t('terms.name'))]"
       :variant="isViewMode ? 'plain' : 'filled'"
       :disabled="isViewMode"
     />
@@ -170,9 +170,9 @@ const status = computed({
 });
 
 const name = computed({
-  get: () => model.value.name?.[0],
+  get: () => model.value.name,
   set: value => {
-    model.value.name = !value ? [] : [value];
+    model.value.name = !value ? '' : value;
   },
 });
 
diff --git a/apps/wallet/src/generated/control-panel/control_panel.did b/apps/wallet/src/generated/control-panel/control_panel.did
index d561bebfc..147111ade 100644
--- a/apps/wallet/src/generated/control-panel/control_panel.did
+++ b/apps/wallet/src/generated/control-panel/control_panel.did
@@ -110,7 +110,7 @@ type UserStation = record {
   // The id associated with the station.
   canister_id : StationID;
   // The name of the station.
-  name : opt text;
+  name : text;
 };
 
 // The result of listing stations.
@@ -149,7 +149,7 @@ type GetUserResult = variant {
 // The input for registering an user.
 type RegisterUserInput = record {
   // A station canister to use for this user.
-  station_id : opt principal;
+  station : opt UserStation;
 };
 
 // The result of registering an user.
@@ -195,6 +195,14 @@ type CanDeployStationResponse = variant {
   QuotaExceeded;
 };
 
+/// The input for deploying a station canister.
+type DeployStationInput = record {
+  // The station name.
+  station_name : text;
+  // The station admin user name.
+  admin_name : text;
+};
+
 // The result of checking if the caller can deploy a station canister.
 type CanDeployStationResult = variant {
   // Successfull operation result.
@@ -264,7 +272,7 @@ service : (opt CanisterInstall) -> {
   // Get main station for the caller user.
   get_main_station : () -> (GetMainStationResult) query;
   // Deploys a new station canister for the caller.
-  deploy_station : () -> (DeployStationResult);
+  deploy_station : (input : DeployStationInput) -> (DeployStationResult);
   // Checks if the caller can deploy a new station canister.
   can_deploy_station : () -> (CanDeployStationResult) query;
   // HTTP Protocol interface.
diff --git a/apps/wallet/src/generated/control-panel/control_panel.did.d.ts b/apps/wallet/src/generated/control-panel/control_panel.did.d.ts
index 9698ac522..15731bf6d 100644
--- a/apps/wallet/src/generated/control-panel/control_panel.did.d.ts
+++ b/apps/wallet/src/generated/control-panel/control_panel.did.d.ts
@@ -24,6 +24,10 @@ export interface CanisterUpgrade {
   'station_wasm_module' : [] | [Uint8Array | number[]],
   'upgrader_wasm_module' : [] | [Uint8Array | number[]],
 }
+export interface DeployStationInput {
+  'admin_name' : string,
+  'station_name' : string,
+}
 export type DeployStationResult = { 'Ok' : { 'canister_id' : StationID } } |
   { 'Err' : ApiError };
 export type GetMainStationResult = {
@@ -59,7 +63,7 @@ export interface ManageUserInput {
 }
 export type ManageUserResult = { 'Ok' : { 'user' : User } } |
   { 'Err' : ApiError };
-export interface RegisterUserInput { 'station_id' : [] | [Principal] }
+export interface RegisterUserInput { 'station' : [] | [UserStation] }
 export type RegisterUserResult = { 'Ok' : { 'user' : User } } |
   { 'Err' : ApiError };
 export type RemoveUserResult = { 'Ok' : { 'user' : User } } |
@@ -90,10 +94,7 @@ export interface User {
 }
 export type UserId = UUID;
 export type UserIdentityID = Principal;
-export interface UserStation {
-  'name' : [] | [string],
-  'canister_id' : StationID,
-}
+export interface UserStation { 'name' : string, 'canister_id' : StationID }
 export type UserSubscriptionStatus = { 'Unsubscribed' : null } |
   { 'Approved' : null } |
   { 'Denylisted' : null } |
@@ -101,7 +102,7 @@ export type UserSubscriptionStatus = { 'Unsubscribed' : null } |
 export interface _SERVICE {
   'can_deploy_station' : ActorMethod<[], CanDeployStationResult>,
   'delete_user' : ActorMethod<[], RemoveUserResult>,
-  'deploy_station' : ActorMethod<[], DeployStationResult>,
+  'deploy_station' : ActorMethod<[DeployStationInput], DeployStationResult>,
   'get_main_station' : ActorMethod<[], GetMainStationResult>,
   'get_user' : ActorMethod<[], GetUserResult>,
   'get_waiting_list' : ActorMethod<[], GetWaitingListResult>,
diff --git a/apps/wallet/src/generated/control-panel/control_panel.did.js b/apps/wallet/src/generated/control-panel/control_panel.did.js
index 8672793d7..5a79b7f63 100644
--- a/apps/wallet/src/generated/control-panel/control_panel.did.js
+++ b/apps/wallet/src/generated/control-panel/control_panel.did.js
@@ -33,7 +33,7 @@ export const idlFactory = ({ IDL }) => {
   });
   const StationID = IDL.Principal;
   const UserStation = IDL.Record({
-    'name' : IDL.Opt(IDL.Text),
+    'name' : IDL.Text,
     'canister_id' : StationID,
   });
   const TimestampRFC3339 = IDL.Text;
@@ -48,6 +48,10 @@ export const idlFactory = ({ IDL }) => {
     'Ok' : IDL.Record({ 'user' : User }),
     'Err' : ApiError,
   });
+  const DeployStationInput = IDL.Record({
+    'admin_name' : IDL.Text,
+    'station_name' : IDL.Text,
+  });
   const DeployStationResult = IDL.Variant({
     'Ok' : IDL.Record({ 'canister_id' : StationID }),
     'Err' : ApiError,
@@ -95,9 +99,7 @@ export const idlFactory = ({ IDL }) => {
     'Ok' : IDL.Record({ 'user' : User }),
     'Err' : ApiError,
   });
-  const RegisterUserInput = IDL.Record({
-    'station_id' : IDL.Opt(IDL.Principal),
-  });
+  const RegisterUserInput = IDL.Record({ 'station' : IDL.Opt(UserStation) });
   const RegisterUserResult = IDL.Variant({
     'Ok' : IDL.Record({ 'user' : User }),
     'Err' : ApiError,
@@ -121,7 +123,11 @@ export const idlFactory = ({ IDL }) => {
   return IDL.Service({
     'can_deploy_station' : IDL.Func([], [CanDeployStationResult], ['query']),
     'delete_user' : IDL.Func([], [RemoveUserResult], []),
-    'deploy_station' : IDL.Func([], [DeployStationResult], []),
+    'deploy_station' : IDL.Func(
+        [DeployStationInput],
+        [DeployStationResult],
+        [],
+      ),
     'get_main_station' : IDL.Func([], [GetMainStationResult], ['query']),
     'get_user' : IDL.Func([], [GetUserResult], ['query']),
     'get_waiting_list' : IDL.Func([], [GetWaitingListResult], []),
diff --git a/apps/wallet/src/generated/station/station.did b/apps/wallet/src/generated/station/station.did
index 1ecbb4e1a..9bb39d51b 100644
--- a/apps/wallet/src/generated/station/station.did
+++ b/apps/wallet/src/generated/station/station.did
@@ -427,7 +427,7 @@ type RemoveAddressBookEntryOperationInput = record {
 
 type AddUserOperationInput = record {
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
   // The principals associated with the user.
   identities : vec principal;
   // The list of groups the user belongs to.
@@ -711,7 +711,7 @@ type RequestAdditionalInfo = record {
   // The request id.
   id : UUID;
   // The requester name (e.g. "John Doe").
-  requester_name : opt text;
+  requester_name : text;
   // Display information for the approvers.
   approvers : vec DisplayUser;
   // The evaluation result of all matching policies for the request.
@@ -1037,7 +1037,7 @@ type User = record {
   // The UUID of the user (e.g. "d0cf5b3f-7017-4cb8-9dcf-52619c42a7b0").
   id : UUID;
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
   // The status of the user (e.g. `Active`).
   status : UserStatus;
   // The list of groups the user belongs to.
@@ -1368,9 +1368,11 @@ type Asset = record {
   metadata : vec AssetMetadata;
 };
 
-// A record type that is used to show the current capabilities of the canister and it's version.
+// A record type that is used to show the current capabilities of the station.
 type Capabilities = record {
-  // Version of the canister.
+  // The name of the station.
+  name : text;
+  // Version of the station.
   version : text;
   // The list of supported assets.
   supported_assets : vec Asset;
@@ -1387,9 +1389,11 @@ type CapabilitiesResult = variant {
   Err : Error;
 };
 
-// The canister system information.
+// The system information.
 type SystemInfo = record {
-  // The canister version.
+  // The name of the station.
+  name : text;
+  // The station version.
   version : text;
   // The upgrader principal id.
   upgrader_id : principal;
@@ -1591,7 +1595,7 @@ type DisplayUser = record {
   // The UUID of the user (e.g. "d0cf5b3f-7017-4cb8-9dcf-52619c42a7b0").
   id : UUID;
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
 };
 
 // Result type for listing permissions.
@@ -1739,20 +1743,31 @@ type MeResult = variant {
   Err : Error;
 };
 
+// The admin that is created in the station during the init process.
+type AdminInitInput = record {
+  // The name of the user.
+  name : text;
+  // The identity of the admin.
+  identity : principal;
+};
+
 // The init configuration for the canister.
 //
 // Only used when installing the canister for the first time.
 type SystemInit = record {
+  // The name of the station.
+  name : text;
   // The list of admin principals to be associated with the station.
-  //
-  // When not specified, the caller will be added as the admin.
-  admins : opt vec principal;
+  admins : vec AdminInitInput;
   // The wasm module of the station upgrader canister.
   upgrader_wasm_module : blob;
 };
 
 // The upgrade configuration for the canister.
-type SystemUpgrade = record {};
+type SystemUpgrade = record {
+  // The updated name of the station.
+  name : opt text;
+};
 
 // The input type for the canister install method (e.g. init or upgrade).
 type SystemInstall = variant {
diff --git a/apps/wallet/src/generated/station/station.did.d.ts b/apps/wallet/src/generated/station/station.did.d.ts
index 7b60c6872..d495b8f03 100644
--- a/apps/wallet/src/generated/station/station.did.d.ts
+++ b/apps/wallet/src/generated/station/station.did.d.ts
@@ -84,7 +84,7 @@ export interface AddUserOperation {
 export interface AddUserOperationInput {
   'status' : UserStatus,
   'groups' : Array<UUID>,
-  'name' : [] | [string],
+  'name' : string,
   'identities' : Array<Principal>,
 }
 export interface AddressBookEntry {
@@ -102,6 +102,7 @@ export interface AddressBookEntryCallerPrivileges {
   'can_edit' : boolean,
 }
 export interface AddressBookMetadata { 'key' : string, 'value' : string }
+export interface AdminInitInput { 'name' : string, 'identity' : Principal }
 export interface Allow {
   'user_groups' : Array<UUID>,
   'auth_scope' : AuthScope,
@@ -125,6 +126,7 @@ export interface BasicUser {
   'name' : string,
 }
 export interface Capabilities {
+  'name' : string,
   'version' : string,
   'supported_assets' : Array<Asset>,
 }
@@ -163,7 +165,7 @@ export type CreateRequestResult = {
     }
   } |
   { 'Err' : Error };
-export interface DisplayUser { 'id' : UUID, 'name' : [] | [string] }
+export interface DisplayUser { 'id' : UUID, 'name' : string }
 export interface EditAccountOperation { 'input' : EditAccountOperationInput }
 export interface EditAccountOperationInput {
   'account_id' : UUID,
@@ -544,7 +546,7 @@ export interface Request {
 export interface RequestAdditionalInfo {
   'id' : UUID,
   'evaluation_result' : [] | [RequestEvaluationResult],
-  'requester_name' : [] | [string],
+  'requester_name' : string,
   'approvers' : Array<DisplayUser>,
 }
 export interface RequestApproval {
@@ -711,6 +713,7 @@ export type SubmitRequestApprovalResult = {
   } |
   { 'Err' : Error };
 export interface SystemInfo {
+  'name' : string,
   'last_upgrade_timestamp' : TimestampRFC3339,
   'raw_rand_successful' : boolean,
   'version' : string,
@@ -720,14 +723,15 @@ export interface SystemInfo {
 export type SystemInfoResult = { 'Ok' : { 'system' : SystemInfo } } |
   { 'Err' : Error };
 export interface SystemInit {
-  'admins' : [] | [Array<Principal>],
+  'name' : string,
+  'admins' : Array<AdminInitInput>,
   'upgrader_wasm_module' : Uint8Array | number[],
 }
 export type SystemInstall = { 'Upgrade' : SystemUpgrade } |
   { 'Init' : SystemInit };
 export type SystemResourceAction = { 'SystemInfo' : null } |
   { 'Capabilities' : null };
-export type SystemUpgrade = {};
+export interface SystemUpgrade { 'name' : [] | [string] }
 export type TimestampRFC3339 = string;
 export interface Transfer {
   'id' : UUID,
@@ -782,7 +786,7 @@ export interface User {
   'id' : UUID,
   'status' : UserStatus,
   'groups' : Array<UserGroup>,
-  'name' : [] | [string],
+  'name' : string,
   'last_modification_timestamp' : TimestampRFC3339,
   'identities' : Array<Principal>,
 }
diff --git a/apps/wallet/src/generated/station/station.did.js b/apps/wallet/src/generated/station/station.did.js
index 849e50cdc..d74c9b700 100644
--- a/apps/wallet/src/generated/station/station.did.js
+++ b/apps/wallet/src/generated/station/station.did.js
@@ -1,9 +1,14 @@
 export const idlFactory = ({ IDL }) => {
   const RequestPolicyRule = IDL.Rec();
   const RequestPolicyRuleResult = IDL.Rec();
-  const SystemUpgrade = IDL.Record({});
+  const SystemUpgrade = IDL.Record({ 'name' : IDL.Opt(IDL.Text) });
+  const AdminInitInput = IDL.Record({
+    'name' : IDL.Text,
+    'identity' : IDL.Principal,
+  });
   const SystemInit = IDL.Record({
-    'admins' : IDL.Opt(IDL.Vec(IDL.Principal)),
+    'name' : IDL.Text,
+    'admins' : IDL.Vec(AdminInitInput),
     'upgrader_wasm_module' : IDL.Vec(IDL.Nat8),
   });
   const SystemInstall = IDL.Variant({
@@ -20,6 +25,7 @@ export const idlFactory = ({ IDL }) => {
     'symbol' : AssetSymbol,
   });
   const Capabilities = IDL.Record({
+    'name' : IDL.Text,
     'version' : IDL.Text,
     'supported_assets' : IDL.Vec(Asset),
   });
@@ -102,7 +108,7 @@ export const idlFactory = ({ IDL }) => {
   const AddUserOperationInput = IDL.Record({
     'status' : UserStatus,
     'groups' : IDL.Vec(UUID),
-    'name' : IDL.Opt(IDL.Text),
+    'name' : IDL.Text,
     'identities' : IDL.Vec(IDL.Principal),
   });
   const EditUserGroupOperationInput = IDL.Record({
@@ -302,7 +308,7 @@ export const idlFactory = ({ IDL }) => {
     'id' : UUID,
     'status' : UserStatus,
     'groups' : IDL.Vec(UserGroup),
-    'name' : IDL.Opt(IDL.Text),
+    'name' : IDL.Text,
     'last_modification_timestamp' : TimestampRFC3339,
     'identities' : IDL.Vec(IDL.Principal),
   });
@@ -458,11 +464,11 @@ export const idlFactory = ({ IDL }) => {
     'status' : EvaluationStatus,
     'policy_results' : IDL.Vec(RequestPolicyRuleResult),
   });
-  const DisplayUser = IDL.Record({ 'id' : UUID, 'name' : IDL.Opt(IDL.Text) });
+  const DisplayUser = IDL.Record({ 'id' : UUID, 'name' : IDL.Text });
   const RequestAdditionalInfo = IDL.Record({
     'id' : UUID,
     'evaluation_result' : IDL.Opt(RequestEvaluationResult),
-    'requester_name' : IDL.Opt(IDL.Text),
+    'requester_name' : IDL.Text,
     'approvers' : IDL.Vec(DisplayUser),
   });
   const CreateRequestResult = IDL.Variant({
@@ -897,6 +903,7 @@ export const idlFactory = ({ IDL }) => {
     'Err' : Error,
   });
   const SystemInfo = IDL.Record({
+    'name' : IDL.Text,
     'last_upgrade_timestamp' : TimestampRFC3339,
     'raw_rand_successful' : IDL.Bool,
     'version' : IDL.Text,
@@ -1010,9 +1017,14 @@ export const idlFactory = ({ IDL }) => {
   });
 };
 export const init = ({ IDL }) => {
-  const SystemUpgrade = IDL.Record({});
+  const SystemUpgrade = IDL.Record({ 'name' : IDL.Opt(IDL.Text) });
+  const AdminInitInput = IDL.Record({
+    'name' : IDL.Text,
+    'identity' : IDL.Principal,
+  });
   const SystemInit = IDL.Record({
-    'admins' : IDL.Opt(IDL.Vec(IDL.Principal)),
+    'name' : IDL.Text,
+    'admins' : IDL.Vec(AdminInitInput),
     'upgrader_wasm_module' : IDL.Vec(IDL.Nat8),
   });
   const SystemInstall = IDL.Variant({
diff --git a/apps/wallet/src/locales/en.locale.ts b/apps/wallet/src/locales/en.locale.ts
index 8b20a688b..aa48d0d8b 100644
--- a/apps/wallet/src/locales/en.locale.ts
+++ b/apps/wallet/src/locales/en.locale.ts
@@ -546,9 +546,15 @@ export default {
       join_station_body:
         'Contact the owner to get the Wallet ID and send them your identity so that a user can be created for you.',
       join_station_canister_id: 'Wallet ID',
-      join_station_name: 'Wallet Name (optional)',
+      join_station_name: 'Wallet Name',
       join_station: 'Join wallet',
 
+      station_title: 'Create your own wallet',
+      station_body:
+        'Create your own wallet and manage your digital assets. You can add users, set permissions and manage request approval policies.',
+      station_name_field: 'Wallet Name',
+      admin_name_field: 'Admin Name',
+
       check_permissions_title: 'Checking waiting list status...',
       join_waitlist_title: 'Join waiting list',
       join_waitlist_body:
diff --git a/apps/wallet/src/locales/fr.locale.ts b/apps/wallet/src/locales/fr.locale.ts
index fc6436262..bf1d2d669 100644
--- a/apps/wallet/src/locales/fr.locale.ts
+++ b/apps/wallet/src/locales/fr.locale.ts
@@ -555,6 +555,12 @@ export default {
       join_waitlist_email_field: 'Entrez votre adresse e-mail',
       join_waitlist: "S'inscrire maintenant",
 
+      station_title: 'Créer un portefeuille',
+      station_body:
+        'Créez un portefeuille pour gérer vos actifs numériques. Entrez un nom pour votre portefeuille et cliquez sur "Créer".',
+      station_name_field: 'Nom du Portefeuille',
+      admin_name_field: 'Nom de l Administrateur',
+
       waitlist_pending_title: 'Vous êtes sur la liste d attente!',
       waitlist_pending_body:
         'Veuillez attendre l approbation. Vous recevrez un email une fois votre demande approuvée.',
@@ -573,7 +579,7 @@ export default {
       join_station_body:
         "Contactez le propriétaire pour obtenir l'ID du portefeuille et envoyez-lui votre identité afin qu'un utilisateur puisse être créé pour vous.",
       join_station_canister_id: 'ID du Portefeuille',
-      join_station_name: 'Nom du Portefeuille (optionnel)',
+      join_station_name: 'Nom du Portefeuille',
       join_station: 'Rejoindre le portefeuille',
 
       status_starting: 'Initialization, veuillez patienter...',
diff --git a/apps/wallet/src/locales/pt.locale.ts b/apps/wallet/src/locales/pt.locale.ts
index 7f2455105..023cf4159 100644
--- a/apps/wallet/src/locales/pt.locale.ts
+++ b/apps/wallet/src/locales/pt.locale.ts
@@ -548,9 +548,15 @@ export default {
       join_station_body:
         'Entre em contato com o proprietário para obter o ID da Carteira e envie a eles sua identidade para que um usuário possa ser criado para você.',
       join_station_canister_id: 'ID da carteira',
-      join_station_name: 'Nome da carteira (opcional)',
+      join_station_name: 'Nome da carteira',
       join_station: 'Junte-se a carteira',
 
+      station_title: 'Crie a sua própria carteira',
+      station_body:
+        'Crie a sua própria carteira e adicione usuários para gerenciar as suas contas e ativos digitais.',
+      station_name_field: 'Nome da carteira',
+      admin_name_field: 'Nome do administrador',
+
       check_permissions_title: 'Verificando o estado da lista de espera ...',
       join_waitlist_title: 'Junte-se à lista de espera',
       join_waitlist_body:
diff --git a/apps/wallet/src/mappers/requests.mapper.ts b/apps/wallet/src/mappers/requests.mapper.ts
index 4f82e8abc..cc2e0c8eb 100644
--- a/apps/wallet/src/mappers/requests.mapper.ts
+++ b/apps/wallet/src/mappers/requests.mapper.ts
@@ -338,7 +338,7 @@ const mapRequestToUserCsvRow = (request: Request): CsvRow => {
   if (variantIs(request.operation, 'AddUser')) {
     return {
       user_id: request.operation.AddUser.user?.[0]?.id ?? '',
-      user_name: request.operation.AddUser.input.name?.[0] ?? '',
+      user_name: request.operation.AddUser.input.name,
       details: stringify({
         identities: request.operation.AddUser.input.identities?.map(i => i.toText()),
         status: request.operation.AddUser.input.status,
@@ -560,7 +560,7 @@ export const mapRequestsToCsvTable = (
   const rows = requests.map(entry => {
     const row: CsvRow = {
       id: entry.request.id,
-      requester: entry.additionalInfo?.requester_name[0] ?? entry.request.requested_by,
+      requester: entry.additionalInfo?.requester_name ?? entry.request.requested_by,
       status: mapRequestStatusToText(entry.request.status),
       status_reason: mapRequestStatusToReason(entry.request.status),
       created: entry.request.created_at,
diff --git a/apps/wallet/src/mappers/stations.mapper.ts b/apps/wallet/src/mappers/stations.mapper.ts
index 095159e99..34cc74d94 100644
--- a/apps/wallet/src/mappers/stations.mapper.ts
+++ b/apps/wallet/src/mappers/stations.mapper.ts
@@ -5,6 +5,6 @@ import { Station } from '~/stores/session.store';
 export function stationToUserStation(station: Omit<Station, 'main'>): UserStation {
   return {
     canister_id: Principal.fromText(station.canisterId),
-    name: station.name ? [station.name] : [],
+    name: station.name,
   };
 }
diff --git a/apps/wallet/src/pages/UsersPage.vue b/apps/wallet/src/pages/UsersPage.vue
index 2bdb465b8..6f10c3c39 100644
--- a/apps/wallet/src/pages/UsersPage.vue
+++ b/apps/wallet/src/pages/UsersPage.vue
@@ -48,7 +48,7 @@
             </template>
             <template #item.name="{ item: user }">
               <div class="d-flex align-center">
-                {{ user.name?.[0] ?? '-' }}
+                {{ user.name }}
               </div>
             </template>
             <template #item.status="{ item: user }">
diff --git a/apps/wallet/src/plugins/services.plugin.ts b/apps/wallet/src/plugins/services.plugin.ts
index 47d0a8777..40dc191cb 100644
--- a/apps/wallet/src/plugins/services.plugin.ts
+++ b/apps/wallet/src/plugins/services.plugin.ts
@@ -17,7 +17,7 @@ export interface Services {
   sessionExpiration: SessionExpirationService;
 }
 
-const getDefauultServices = (): Services => ({
+const getDefaultServices = (): Services => ({
   locales: new LocalesService(),
   auth: new AuthService(),
   theme: new ThemeService(),
@@ -29,7 +29,7 @@ const getDefauultServices = (): Services => ({
 });
 
 class ServiceManager {
-  constructor(public services: Services = getDefauultServices()) {}
+  constructor(public services: Services = getDefaultServices()) {}
 
   withAgent(icAgent: HttpAgent): ServiceManager {
     this.services.controlPanel = new ControlPanelService(icAgent);
diff --git a/apps/wallet/src/services/control-panel.service.ts b/apps/wallet/src/services/control-panel.service.ts
index 80286a899..8282c6e9a 100644
--- a/apps/wallet/src/services/control-panel.service.ts
+++ b/apps/wallet/src/services/control-panel.service.ts
@@ -4,6 +4,7 @@ import { appInitConfig } from '~/configs/init.config';
 import { idlFactory } from '~/generated/control-panel';
 import {
   CanDeployStationResponse,
+  DeployStationInput,
   ManageUserInput,
   RegisterUserInput,
   User,
@@ -109,8 +110,8 @@ export class ControlPanelService {
     return result.Ok.stations;
   }
 
-  async deployStation(): Promise<Principal> {
-    const result = await this.actor.deploy_station();
+  async deployStation(input: DeployStationInput): Promise<Principal> {
+    const result = await this.actor.deploy_station(input);
 
     if (variantIs(result, 'Err')) {
       throw result.Err;
diff --git a/apps/wallet/src/stores/session.store.ts b/apps/wallet/src/stores/session.store.ts
index 834e91cb4..d33ede973 100644
--- a/apps/wallet/src/stores/session.store.ts
+++ b/apps/wallet/src/stores/session.store.ts
@@ -17,7 +17,7 @@ import { disableWorkers, enableWorkers } from '~/workers';
 
 export interface Station {
   main: boolean;
-  name: string | null;
+  name: string;
   canisterId: string;
 }
 
@@ -264,7 +264,7 @@ export const useSessionStore = defineStore('session', {
       this.principal = user.identity.toText();
       this.data.stations = user.stations.map(station => ({
         main: station.canister_id.toText() === user.main_station?.[0]?.toText(),
-        name: station.name?.[0] ?? null,
+        name: station.name,
         canisterId: station.canister_id.toText(),
       }));
 
@@ -366,7 +366,7 @@ export const useSessionStore = defineStore('session', {
       if (!isRegistered) {
         await controlPanelService.register({
           // a new user is created with an empty list of stations, they can add them later
-          station_id: [],
+          station: [],
         });
       }
 
diff --git a/apps/wallet/src/stores/station.store.ts b/apps/wallet/src/stores/station.store.ts
index b0c6fe3e7..48db704ac 100644
--- a/apps/wallet/src/stores/station.store.ts
+++ b/apps/wallet/src/stores/station.store.ts
@@ -95,7 +95,7 @@ const initialStoreState = (): StationStoreState => {
     loading: false,
     user: {
       id: '',
-      name: [],
+      name: '',
       status: { Inactive: null },
       groups: [],
       last_modification_timestamp: '',
@@ -105,6 +105,7 @@ const initialStoreState = (): StationStoreState => {
     configuration: {
       loading: false,
       details: {
+        name: '',
         version: '',
         supported_assets: [],
       },
diff --git a/apps/wallet/src/types/station.types.ts b/apps/wallet/src/types/station.types.ts
index d9c8a7295..b286212d9 100644
--- a/apps/wallet/src/types/station.types.ts
+++ b/apps/wallet/src/types/station.types.ts
@@ -134,7 +134,7 @@ export type MetadataItem = { key: string; value: string };
 
 export interface RequestDetails {
   can_approve: boolean;
-  requester_name?: string;
+  requester_name: string;
   approvers: DisplayUser[];
 }
 
diff --git a/core/control-panel/api/spec.did b/core/control-panel/api/spec.did
index d561bebfc..147111ade 100644
--- a/core/control-panel/api/spec.did
+++ b/core/control-panel/api/spec.did
@@ -110,7 +110,7 @@ type UserStation = record {
   // The id associated with the station.
   canister_id : StationID;
   // The name of the station.
-  name : opt text;
+  name : text;
 };
 
 // The result of listing stations.
@@ -149,7 +149,7 @@ type GetUserResult = variant {
 // The input for registering an user.
 type RegisterUserInput = record {
   // A station canister to use for this user.
-  station_id : opt principal;
+  station : opt UserStation;
 };
 
 // The result of registering an user.
@@ -195,6 +195,14 @@ type CanDeployStationResponse = variant {
   QuotaExceeded;
 };
 
+/// The input for deploying a station canister.
+type DeployStationInput = record {
+  // The station name.
+  station_name : text;
+  // The station admin user name.
+  admin_name : text;
+};
+
 // The result of checking if the caller can deploy a station canister.
 type CanDeployStationResult = variant {
   // Successfull operation result.
@@ -264,7 +272,7 @@ service : (opt CanisterInstall) -> {
   // Get main station for the caller user.
   get_main_station : () -> (GetMainStationResult) query;
   // Deploys a new station canister for the caller.
-  deploy_station : () -> (DeployStationResult);
+  deploy_station : (input : DeployStationInput) -> (DeployStationResult);
   // Checks if the caller can deploy a new station canister.
   can_deploy_station : () -> (CanDeployStationResult) query;
   // HTTP Protocol interface.
diff --git a/core/control-panel/api/src/manage_user.rs b/core/control-panel/api/src/manage_user.rs
index fb9da9c19..8e52f6884 100644
--- a/core/control-panel/api/src/manage_user.rs
+++ b/core/control-panel/api/src/manage_user.rs
@@ -27,7 +27,7 @@ pub struct RegisterUserStationSharedInput {
 
 #[derive(CandidType, Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct RegisterUserInput {
-    pub station_id: Option<Principal>,
+    pub station: Option<UserStationDTO>,
 }
 
 #[derive(CandidType, Deserialize, Clone, Debug, Eq, PartialEq)]
diff --git a/core/control-panel/api/src/user_station.rs b/core/control-panel/api/src/user_station.rs
index e8212e2f5..45b64c433 100644
--- a/core/control-panel/api/src/user_station.rs
+++ b/core/control-panel/api/src/user_station.rs
@@ -1,10 +1,16 @@
 use crate::UserSubscriptionStatusDTO;
 use candid::{CandidType, Deserialize, Principal};
 
+#[derive(CandidType, Deserialize, Clone, Debug)]
+pub struct DeployStationInput {
+    pub station_name: String,
+    pub admin_name: String,
+}
+
 #[derive(CandidType, Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct UserStationDTO {
     pub canister_id: Principal,
-    pub name: Option<String>,
+    pub name: String,
 }
 
 #[derive(CandidType, Deserialize, Clone, Debug, Eq, PartialEq)]
diff --git a/core/control-panel/impl/src/controllers/station.rs b/core/control-panel/impl/src/controllers/station.rs
index 8d9eab1a9..ff76b59ef 100644
--- a/core/control-panel/impl/src/controllers/station.rs
+++ b/core/control-panel/impl/src/controllers/station.rs
@@ -5,8 +5,8 @@ use crate::services::{DeployService, DEPLOY_SERVICE, USER_SERVICE};
 use crate::{core::CallContext, services::UserService};
 use candid::Principal;
 use control_panel_api::{
-    CanDeployStationResponse, DeployStationResponse, GetMainStationResponse, ListStationsResponse,
-    UserStationDTO,
+    CanDeployStationResponse, DeployStationInput, DeployStationResponse, GetMainStationResponse,
+    ListStationsResponse, UserStationDTO,
 };
 use ic_cdk_macros::{query, update};
 use lazy_static::lazy_static;
@@ -33,8 +33,8 @@ async fn get_main_station() -> ApiResult<GetMainStationResponse> {
 }
 
 #[update(name = "deploy_station")]
-async fn deploy_station() -> ApiResult<DeployStationResponse> {
-    CONTROLLER.deploy_station().await
+async fn deploy_station(input: DeployStationInput) -> ApiResult<DeployStationResponse> {
+    CONTROLLER.deploy_station(input).await
 }
 
 #[query(name = "can_deploy_station")]
@@ -94,13 +94,13 @@ impl StationController {
         context = &call_context()
     )]
     #[with_middleware(tail = use_status_metric("call_deploy_station", &result))]
-    async fn deploy_station(&self) -> ApiResult<DeployStationResponse> {
+    async fn deploy_station(&self, input: DeployStationInput) -> ApiResult<DeployStationResponse> {
         let ctx = CallContext::get();
         let _lock = STATE
             .with(|state| CallerGuard::new(state.clone(), ctx.caller()))
             .ok_or(UserError::ConcurrentStationDeployment)?;
 
-        let deployed_station_id = self.deploy_service.deploy_station(&ctx).await?;
+        let deployed_station_id = self.deploy_service.deploy_station(input, &ctx).await?;
 
         Ok(DeployStationResponse {
             canister_id: deployed_station_id,
diff --git a/core/control-panel/impl/src/core/config.rs b/core/control-panel/impl/src/core/config.rs
index cac163c77..45a5a5ea3 100644
--- a/core/control-panel/impl/src/core/config.rs
+++ b/core/control-panel/impl/src/core/config.rs
@@ -5,7 +5,7 @@ use orbit_essentials::storable;
 use orbit_essentials::types::Timestamp;
 use std::borrow::Cow;
 
-#[storable(serializer = "candid")]
+#[storable]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct CanisterConfig {
     /// The upgrader canister wasm module that will be used to upgrade the station canister.
diff --git a/core/control-panel/impl/src/core/constants.rs b/core/control-panel/impl/src/core/constants.rs
index db15dd8f3..569ee7f2e 100644
--- a/core/control-panel/impl/src/core/constants.rs
+++ b/core/control-panel/impl/src/core/constants.rs
@@ -7,8 +7,8 @@ pub const MAX_BYTE_SIZE_UUID: u32 = std::mem::size_of::<Uuid>() as u32;
 /// Represents one gigabyte.
 pub const GIB: u64 = 1 << 30;
 
-/// The maximum memory size the canister can use for stable memory, currently set to 32GiB.
-pub const MAX_STABLE_MEMORY_SIZE: u64 = 32 * GIB;
+/// The maximum memory size the canister can use for stable memory, currently set to 256GiB.
+pub const MAX_STABLE_MEMORY_SIZE: u64 = 256 * GIB;
 
 /// Canisters use 64KiB pages for Wasm memory, more details in the PR that introduced this constant:
 ///
@@ -16,7 +16,7 @@ pub const MAX_STABLE_MEMORY_SIZE: u64 = 32 * GIB;
 pub const WASM_PAGE_SIZE: u32 = 65536;
 
 /// The pages to reserve for the canister configuration.
-pub const CANISTER_CONFIG_TOTAL_MEMORY_PAGES: u32 = 31;
+pub const CANISTER_CONFIG_TOTAL_MEMORY_PAGES: u32 = 124;
 
 /// The maximum size of the stable memory that can be used for the canister configuration.
 pub const CANISTER_CONFIG_STATE_SIZE: u32 = WASM_PAGE_SIZE * CANISTER_CONFIG_TOTAL_MEMORY_PAGES;
diff --git a/core/control-panel/impl/src/core/metrics.rs b/core/control-panel/impl/src/core/metrics.rs
index b977beb50..82e2ffb69 100644
--- a/core/control-panel/impl/src/core/metrics.rs
+++ b/core/control-panel/impl/src/core/metrics.rs
@@ -267,7 +267,7 @@ mod tests {
         let mut user = mock_user();
         user.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[1; 29]),
-            name: None,
+            name: "Main Station".to_string(),
         }];
         user.deployed_stations = vec![
             Principal::from_slice(&[1; 29]),
@@ -301,7 +301,7 @@ mod tests {
         let mut user = mock_user();
         user.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[1; 29]),
-            name: None,
+            name: "Main Station".to_string(),
         }];
         user.deployed_stations = vec![
             Principal::from_slice(&[1; 29]),
@@ -315,7 +315,7 @@ mod tests {
         let mut user2 = mock_user();
         user2.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[1; 29]),
-            name: None,
+            name: "Main Station".to_string(),
         }];
         user2.deployed_stations = vec![Principal::from_slice(&[1; 29])];
         user2.subscription_status = UserSubscriptionStatus::Pending("email".to_string());
@@ -354,7 +354,7 @@ mod tests {
         let mut user = mock_user();
         user.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[1; 29]),
-            name: None,
+            name: "Main Station".to_string(),
         }];
         user.deployed_stations = vec![
             Principal::from_slice(&[1; 29]),
@@ -375,11 +375,11 @@ mod tests {
         user.stations = vec![
             UserStation {
                 canister_id: Principal::from_slice(&[1; 29]),
-                name: None,
+                name: "Main Station".to_string(),
             },
             UserStation {
                 canister_id: Principal::from_slice(&[2; 29]),
-                name: None,
+                name: "Second Station".to_string(),
             },
         ];
         user.deployed_stations = vec![
diff --git a/core/control-panel/impl/src/mappers/user.rs b/core/control-panel/impl/src/mappers/user.rs
index d96cf0c81..f42b15240 100644
--- a/core/control-panel/impl/src/mappers/user.rs
+++ b/core/control-panel/impl/src/mappers/user.rs
@@ -24,15 +24,15 @@ impl UserMapper {
         input: RegisterUserInput,
         user_identity: Principal,
     ) -> User {
-        let stations = match input.station_id {
-            Some(station_id) => vec![station_id],
+        let stations = match input.station {
+            Some(station) => vec![station],
             None => vec![],
         };
         // The order of the stations is important, the first station is the main station for the user at this stage
         // so that it can be used to the `main_station` field of the user entity.
         let main_station = match stations.is_empty() {
             true => None,
-            false => Some(stations[0]),
+            false => Some(stations[0].canister_id),
         };
 
         let registration_time = next_time();
@@ -41,13 +41,7 @@ impl UserMapper {
             id: new_user_id,
             identity: user_identity,
             subscription_status: UserSubscriptionStatus::Unsubscribed,
-            stations: stations
-                .into_iter()
-                .map(|canister_id| UserStation {
-                    canister_id,
-                    name: None,
-                })
-                .collect(),
+            stations: stations.into_iter().map(|station| station.into()).collect(),
             deployed_stations: vec![],
             main_station,
             last_active: registration_time,
@@ -138,7 +132,7 @@ mod tests {
     fn mapped_user_registration_with_no_station() {
         let user_id = [u8::MAX; 16];
         let user_identity = Principal::from_slice(&[u8::MAX; 29]);
-        let input = RegisterUserInput { station_id: None };
+        let input = RegisterUserInput { station: None };
 
         let user = UserMapper::from_register_input(user_id, input, user_identity);
 
@@ -153,8 +147,11 @@ mod tests {
         let user_id = [u8::MAX; 16];
         let user_identity = Principal::from_slice(&[u8::MAX; 29]);
         let main_station = Principal::from_slice(&[2; 29]);
-        let input = RegisterUserInput {
-            station_id: Some(main_station),
+        let input: RegisterUserInput = RegisterUserInput {
+            station: Some(UserStationDTO {
+                canister_id: main_station,
+                name: "Main Station".to_string(),
+            }),
         };
 
         let user = UserMapper::from_register_input(user_id, input, user_identity);
@@ -164,6 +161,6 @@ mod tests {
         assert_eq!(user.main_station, Some(main_station));
         assert_eq!(user.stations.len(), 1);
         assert_eq!(user.stations[0].canister_id, main_station);
-        assert_eq!(user.stations[0].name, None);
+        assert_eq!(user.stations[0].name, "Main Station".to_string());
     }
 }
diff --git a/core/control-panel/impl/src/mappers/user_station.rs b/core/control-panel/impl/src/mappers/user_station.rs
index 8d98650d5..048b3bbfb 100644
--- a/core/control-panel/impl/src/mappers/user_station.rs
+++ b/core/control-panel/impl/src/mappers/user_station.rs
@@ -28,7 +28,7 @@ mod tests {
     fn correct_dto_to_model_mapping() {
         let dto = UserStationDTO {
             canister_id: Principal::from_text("wkt3w-3iaaa-aaaaa-774ba-cai").unwrap(),
-            name: Some("Station".to_string()),
+            name: "Station".to_string(),
         };
 
         let model = UserStation::from(dto.clone());
@@ -41,7 +41,7 @@ mod tests {
     fn correct_model_to_dto_mapping() {
         let model = UserStation {
             canister_id: Principal::from_text("wkt3w-3iaaa-aaaaa-774ba-cai").unwrap(),
-            name: Some("Station".to_string()),
+            name: "Station".to_string(),
         };
 
         let dto = UserStationDTO::from(model.clone());
diff --git a/core/control-panel/impl/src/models/user.rs b/core/control-panel/impl/src/models/user.rs
index 8b3a99eda..d14c66314 100644
--- a/core/control-panel/impl/src/models/user.rs
+++ b/core/control-panel/impl/src/models/user.rs
@@ -13,7 +13,7 @@ use std::str::FromStr;
 pub type UserId = UUID;
 
 /// The subscription status of an user.
-#[storable(serializer = "candid")]
+#[storable]
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 pub enum UserSubscriptionStatus {
     Unsubscribed,
@@ -41,7 +41,7 @@ impl std::fmt::Display for UserSubscriptionStatus {
 }
 
 /// The identity of an user.
-#[storable(serializer = "candid")]
+#[storable]
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 pub struct User {
     /// The UUID that identifies the user.
@@ -65,7 +65,7 @@ pub struct User {
     pub last_update_timestamp: Timestamp,
 }
 
-#[storable(serializer = "candid")]
+#[storable]
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 pub struct UserKey(pub UUID);
 
@@ -216,13 +216,13 @@ mod tests {
 
         user_with_one_station.stations.push(UserStation {
             canister_id: Principal::anonymous(),
-            name: None,
+            name: "main".to_string(),
         });
 
         for _ in 0..=User::MAX_STATIONS {
             user_with_too_many_stations.stations.push(UserStation {
                 canister_id: Principal::anonymous(),
-                name: None,
+                name: "main".to_string(),
             });
         }
 
@@ -238,7 +238,7 @@ mod tests {
         user.main_station = Some(Principal::from_slice(&[10; 29]));
         user.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[10; 29]),
-            name: None,
+            name: "main".to_string(),
         }];
 
         assert!(validate_main_station(&user.main_station, &user.stations).is_ok());
@@ -251,7 +251,7 @@ mod tests {
         user.main_station = Some(Principal::from_slice(&[10; 29]));
         user.stations = vec![UserStation {
             canister_id: Principal::from_slice(&[12; 29]),
-            name: None,
+            name: "main".to_string(),
         }];
 
         assert!(validate_main_station(&user.main_station, &user.stations).is_err());
diff --git a/core/control-panel/impl/src/models/user_station.rs b/core/control-panel/impl/src/models/user_station.rs
index f35f3b957..49f4a23d7 100644
--- a/core/control-panel/impl/src/models/user_station.rs
+++ b/core/control-panel/impl/src/models/user_station.rs
@@ -3,11 +3,11 @@ use candid::Principal;
 use orbit_essentials::model::{ModelValidator, ModelValidatorResult};
 use orbit_essentials::storable;
 
-#[storable(serializer = "candid")]
+#[storable]
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Hash)]
 pub struct UserStation {
     pub canister_id: Principal,
-    pub name: Option<String>,
+    pub name: String,
 }
 
 pub struct UserStationValidator<'model> {
@@ -15,31 +15,31 @@ pub struct UserStationValidator<'model> {
 }
 
 impl<'model> UserStationValidator<'model> {
-    pub const NAME_LEN_RANGE: (u8, u8) = (1, 150);
+    pub const NAME_LEN_RANGE: (u8, u8) = (1, 48);
 
     pub fn new(model: &'model UserStation) -> Self {
         Self { model }
     }
 
     pub fn validate_name(&self) -> ModelValidatorResult<UserError> {
-        if let Some(name) = &self.model.name {
-            if (name.trim().len() < Self::NAME_LEN_RANGE.0 as usize)
-                || (name.trim().len() > Self::NAME_LEN_RANGE.1 as usize)
-            {
-                return Err(UserError::ValidationError {
-                    info: format!(
-                        "Station name length must be between {} and {}",
-                        Self::NAME_LEN_RANGE.0,
-                        Self::NAME_LEN_RANGE.1
-                    ),
-                });
-            }
-
-            if name.starts_with(' ') || name.ends_with(' ') {
-                return Err(UserError::ValidationError {
-                    info: "Station name cannot start or end with a space".to_string(),
-                });
-            }
+        let name = self.model.name.clone();
+
+        if (name.trim().len() < Self::NAME_LEN_RANGE.0 as usize)
+            || (name.trim().len() > Self::NAME_LEN_RANGE.1 as usize)
+        {
+            return Err(UserError::ValidationError {
+                info: format!(
+                    "Station name length must be between {} and {}",
+                    Self::NAME_LEN_RANGE.0,
+                    Self::NAME_LEN_RANGE.1
+                ),
+            });
+        }
+
+        if name.starts_with(' ') || name.ends_with(' ') {
+            return Err(UserError::ValidationError {
+                info: "Station name cannot start or end with a space".to_string(),
+            });
         }
 
         Ok(())
@@ -68,7 +68,7 @@ mod tests {
     fn valid_model_serialization() {
         let user_station = UserStation {
             canister_id: Principal::from_text("wkt3w-3iaaa-aaaaa-774ba-cai").unwrap(),
-            name: Some("Station 1".to_string()),
+            name: "Station 1".to_string(),
         };
 
         let serialized_model = user_station.to_bytes();
@@ -83,11 +83,11 @@ mod tests {
     #[case::empty_name_with_space(&" ")]
     #[case::starts_with_space(&" Treasury")]
     #[case::ends_with_space(&"Treasury ")]
-    #[case::name_too_big(&"amkyMJuUzYRXmxJuyUFeetxXbkMKmfCBwQnSazukXXGuxmwXJEcxxSxAMqLzZWSzaYpdfKCnKDTjfrkfYvRhhmCrTrVmqUUkbgdMKufYuimeCebnHWgQXeSzkeqcFLqSVxpdNeSGADkpvvjZHCYXLmM")]
+    #[case::name_too_big(&"amkyMJuUzYRXmxJuyUFeetxXbkMKmfCBwQnSazukXXGuxmwX1")]
     fn invalid_user_station_name(#[case] name: &str) {
         let user_station = UserStation {
             canister_id: Principal::anonymous(),
-            name: Some(String::from(name)),
+            name: String::from(name),
         };
         let validator = UserStationValidator::new(&user_station);
 
@@ -95,15 +95,14 @@ mod tests {
     }
 
     #[rstest]
-    #[case::no_name(None)]
-    #[case::short_name(Some(String::from("A")))]
-    #[case::short_number_name(Some(String::from("1")))]
-    #[case::common_name(Some(String::from("Treasury")))]
-    #[case::long_name(Some(String::from("amkyMJuUzYRXmxJuyUFeetxXbkMKmfCBwQnSazukXXGuxmwXJEcxxSxAMqLzZWSzaYpdfKCnKDTjfrkfYvRhhmCrTrVmqUUkbgdMKufYuimeCebnHWgQXeSzkeqcFLqSVxpdNeSGADkpvvjZHCYXLm")))]
-    fn valid_user_station_name(#[case] name: Option<String>) {
+    #[case::short_name("A")]
+    #[case::short_number_name("1")]
+    #[case::common_name("Treasury")]
+    #[case::long_name("amkyMJuUzYRXmxJuyUFeetxXbkMKmfCBwQnSazukXXGuxmwX")]
+    fn valid_user_station_name(#[case] name: &str) {
         let user_station = UserStation {
             canister_id: Principal::anonymous(),
-            name,
+            name: String::from(name),
         };
         let validator = UserStationValidator::new(&user_station);
 
diff --git a/core/control-panel/impl/src/services/deploy.rs b/core/control-panel/impl/src/services/deploy.rs
index bb7756a2c..252221bc8 100644
--- a/core/control-panel/impl/src/services/deploy.rs
+++ b/core/control-panel/impl/src/services/deploy.rs
@@ -6,6 +6,7 @@ use crate::{
     services::USER_SERVICE,
 };
 use candid::{Encode, Principal};
+use control_panel_api::DeployStationInput;
 use ic_cdk::api::id as self_canister_id;
 use ic_cdk::api::management_canister::main::{self as mgmt};
 use lazy_static::lazy_static;
@@ -28,7 +29,11 @@ impl DeployService {
     }
 
     /// Deploys a station canister for the user.
-    pub async fn deploy_station(&self, ctx: &CallContext) -> ServiceResult<Principal> {
+    pub async fn deploy_station(
+        &self,
+        input: DeployStationInput,
+        ctx: &CallContext,
+    ) -> ServiceResult<Principal> {
         let user = self.user_service.get_user_by_identity(&ctx.caller(), ctx)?;
 
         let can_deploy_station_response = user.can_deploy_station();
@@ -74,7 +79,11 @@ impl DeployService {
             canister_id: station_canister.canister_id,
             wasm_module: config.station_wasm_module,
             arg: Encode!(&station_api::SystemInstall::Init(station_api::SystemInit {
-                admins: Some(vec![user.identity]),
+                name: input.station_name.clone(),
+                admins: vec![station_api::AdminInitInput {
+                    identity: user.identity,
+                    name: input.admin_name.clone(),
+                }],
                 upgrader_wasm_module: config.upgrader_wasm_module,
             }))
             .map_err(|err| DeployError::Failed {
@@ -87,7 +96,12 @@ impl DeployService {
         })?;
 
         self.user_service
-            .add_deployed_station(&user.id, station_canister.canister_id, ctx)
+            .add_deployed_station(
+                &user.id,
+                station_canister.canister_id,
+                input.station_name,
+                ctx,
+            )
             .await?;
 
         if user.main_station.is_none() {
diff --git a/core/control-panel/impl/src/services/user.rs b/core/control-panel/impl/src/services/user.rs
index a13571872..c393627ef 100644
--- a/core/control-panel/impl/src/services/user.rs
+++ b/core/control-panel/impl/src/services/user.rs
@@ -218,13 +218,14 @@ impl UserService {
         &self,
         user_id: &UserId,
         station_canister_id: Principal,
+        station_name: String,
         ctx: &CallContext,
     ) -> ServiceResult<User> {
         let mut user = self.get_user(user_id, ctx)?;
 
         user.stations.push(UserStation {
             canister_id: station_canister_id,
-            name: None,
+            name: station_name,
         });
         user.deployed_stations.push(station_canister_id);
 
@@ -308,7 +309,7 @@ impl UserService {
 mod tests {
     use super::*;
     use crate::models::{user_model_utils::mock_user, UserSubscriptionStatus};
-    use control_panel_api::UserSubscriptionStatusDTO;
+    use control_panel_api::{UserStationDTO, UserSubscriptionStatusDTO};
     use orbit_essentials::cdk::mocks::TEST_CONTROLLER_ID;
 
     #[test]
@@ -365,7 +366,10 @@ mod tests {
         let ctx = CallContext::new(Principal::from_slice(&[1; 29]));
         let service = UserService::default();
         let input = RegisterUserInput {
-            station_id: Some(Principal::from_slice(&[2; 29])),
+            station: Some(UserStationDTO {
+                canister_id: Principal::from_slice(&[2; 29]),
+                name: "Station".to_string(),
+            }),
         };
 
         let result = service.register_user(input.clone(), &ctx).await;
@@ -380,7 +384,10 @@ mod tests {
         let ctx = CallContext::new(Principal::anonymous());
         let service = UserService::default();
         let input = RegisterUserInput {
-            station_id: Some(Principal::from_slice(&[2; 29])),
+            station: Some(UserStationDTO {
+                canister_id: Principal::from_slice(&[2; 29]),
+                name: "Station".to_string(),
+            }),
         };
 
         let result = service.register_user(input.clone(), &ctx).await;
@@ -402,8 +409,8 @@ mod tests {
 
         let ctx = CallContext::new(Principal::from_slice(&[1; 29]));
         let service = UserService::default();
-        let input = RegisterUserInput { station_id: None };
-        let duplicated_user_input = RegisterUserInput { station_id: None };
+        let input = RegisterUserInput { station: None };
+        let duplicated_user_input = RegisterUserInput { station: None };
 
         let result = service.register_user(input.clone(), &ctx).await;
         let duplicated_user_result = service
diff --git a/core/station/api/spec.did b/core/station/api/spec.did
index 1ecbb4e1a..9bb39d51b 100644
--- a/core/station/api/spec.did
+++ b/core/station/api/spec.did
@@ -427,7 +427,7 @@ type RemoveAddressBookEntryOperationInput = record {
 
 type AddUserOperationInput = record {
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
   // The principals associated with the user.
   identities : vec principal;
   // The list of groups the user belongs to.
@@ -711,7 +711,7 @@ type RequestAdditionalInfo = record {
   // The request id.
   id : UUID;
   // The requester name (e.g. "John Doe").
-  requester_name : opt text;
+  requester_name : text;
   // Display information for the approvers.
   approvers : vec DisplayUser;
   // The evaluation result of all matching policies for the request.
@@ -1037,7 +1037,7 @@ type User = record {
   // The UUID of the user (e.g. "d0cf5b3f-7017-4cb8-9dcf-52619c42a7b0").
   id : UUID;
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
   // The status of the user (e.g. `Active`).
   status : UserStatus;
   // The list of groups the user belongs to.
@@ -1368,9 +1368,11 @@ type Asset = record {
   metadata : vec AssetMetadata;
 };
 
-// A record type that is used to show the current capabilities of the canister and it's version.
+// A record type that is used to show the current capabilities of the station.
 type Capabilities = record {
-  // Version of the canister.
+  // The name of the station.
+  name : text;
+  // Version of the station.
   version : text;
   // The list of supported assets.
   supported_assets : vec Asset;
@@ -1387,9 +1389,11 @@ type CapabilitiesResult = variant {
   Err : Error;
 };
 
-// The canister system information.
+// The system information.
 type SystemInfo = record {
-  // The canister version.
+  // The name of the station.
+  name : text;
+  // The station version.
   version : text;
   // The upgrader principal id.
   upgrader_id : principal;
@@ -1591,7 +1595,7 @@ type DisplayUser = record {
   // The UUID of the user (e.g. "d0cf5b3f-7017-4cb8-9dcf-52619c42a7b0").
   id : UUID;
   // The user name (e.g. "John Doe").
-  name : opt text;
+  name : text;
 };
 
 // Result type for listing permissions.
@@ -1739,20 +1743,31 @@ type MeResult = variant {
   Err : Error;
 };
 
+// The admin that is created in the station during the init process.
+type AdminInitInput = record {
+  // The name of the user.
+  name : text;
+  // The identity of the admin.
+  identity : principal;
+};
+
 // The init configuration for the canister.
 //
 // Only used when installing the canister for the first time.
 type SystemInit = record {
+  // The name of the station.
+  name : text;
   // The list of admin principals to be associated with the station.
-  //
-  // When not specified, the caller will be added as the admin.
-  admins : opt vec principal;
+  admins : vec AdminInitInput;
   // The wasm module of the station upgrader canister.
   upgrader_wasm_module : blob;
 };
 
 // The upgrade configuration for the canister.
-type SystemUpgrade = record {};
+type SystemUpgrade = record {
+  // The updated name of the station.
+  name : opt text;
+};
 
 // The input type for the canister install method (e.g. init or upgrade).
 type SystemInstall = variant {
diff --git a/core/station/api/src/capabilities.rs b/core/station/api/src/capabilities.rs
index 7b9aeba30..23ebd35c6 100644
--- a/core/station/api/src/capabilities.rs
+++ b/core/station/api/src/capabilities.rs
@@ -21,6 +21,8 @@ pub struct AssetDTO {
 /// The capabilities of the canister.
 #[derive(CandidType, Deserialize, Clone, Debug)]
 pub struct CapabilitiesDTO {
+    /// The name of the canister.
+    pub name: String,
     /// The current version of the canister.
     pub version: String,
     /// The list of assets that are supported by the canister (e.g. `ICP`, `BTC`, `ETH`, etc.)
diff --git a/core/station/api/src/request.rs b/core/station/api/src/request.rs
index b8937ecee..f0684b5e8 100644
--- a/core/station/api/src/request.rs
+++ b/core/station/api/src/request.rs
@@ -142,7 +142,7 @@ pub struct RequestCallerPrivilegesDTO {
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct RequestAdditionalInfoDTO {
     pub id: UuidDTO,
-    pub requester_name: Option<String>,
+    pub requester_name: String,
     pub approvers: Vec<DisplayUserDTO>,
     pub evaluation_result: Option<RequestEvaluationResultDTO>,
 }
diff --git a/core/station/api/src/system.rs b/core/station/api/src/system.rs
index 1f61290cb..13cc5dda4 100644
--- a/core/station/api/src/system.rs
+++ b/core/station/api/src/system.rs
@@ -3,6 +3,7 @@ use candid::{CandidType, Deserialize, Principal};
 
 #[derive(CandidType, Deserialize, Clone, Debug)]
 pub struct SystemInfoDTO {
+    pub name: String,
     pub version: String,
     pub upgrader_id: Principal,
     pub cycles: u64,
@@ -15,14 +16,23 @@ pub struct SystemInfoResponse {
     pub system: SystemInfoDTO,
 }
 
+#[derive(CandidType, Deserialize, Clone, Debug)]
+pub struct AdminInitInput {
+    pub name: String,
+    pub identity: Principal,
+}
+
 #[derive(CandidType, Deserialize, Clone, Debug)]
 pub struct SystemInit {
-    pub admins: Option<Vec<Principal>>,
+    pub name: String,
+    pub admins: Vec<AdminInitInput>,
     pub upgrader_wasm_module: Vec<u8>,
 }
 
 #[derive(CandidType, Deserialize, Clone, Debug)]
-pub struct SystemUpgrade {}
+pub struct SystemUpgrade {
+    pub name: Option<String>,
+}
 
 #[derive(CandidType, Deserialize, Clone, Debug)]
 pub enum SystemInstall {
diff --git a/core/station/api/src/user.rs b/core/station/api/src/user.rs
index 9c24e4942..89d3904d3 100644
--- a/core/station/api/src/user.rs
+++ b/core/station/api/src/user.rs
@@ -20,7 +20,7 @@ pub struct UserDTO {
     pub identities: Vec<Principal>,
     pub groups: Vec<UserGroupDTO>,
     pub status: UserStatusDTO,
-    pub name: Option<String>,
+    pub name: String,
     pub last_modification_timestamp: TimestampRfc3339,
 }
 
@@ -34,7 +34,7 @@ pub struct BasicUserDTO {
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct DisplayUserDTO {
     pub id: UuidDTO,
-    pub name: Option<String>,
+    pub name: String,
 }
 
 #[derive(CandidType, Deserialize, Debug, Clone)]
@@ -50,7 +50,7 @@ pub struct GetUserResponse {
 
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct AddUserOperationInput {
-    pub name: Option<String>,
+    pub name: String,
     pub identities: Vec<Principal>,
     pub groups: Vec<String>,
     pub status: UserStatusDTO,
diff --git a/core/station/impl/src/controllers/capabilities.rs b/core/station/impl/src/controllers/capabilities.rs
index ddbf6cf4b..a3cf75999 100644
--- a/core/station/impl/src/controllers/capabilities.rs
+++ b/core/station/impl/src/controllers/capabilities.rs
@@ -1,7 +1,7 @@
 use crate::{
     core::{
         middlewares::{authorize, call_context},
-        ASSETS,
+        read_system_info, ASSETS,
     },
     models::resource::{Resource, SystemResourceAction},
     SYSTEM_VERSION,
@@ -33,9 +33,11 @@ impl CapabilitiesController {
     #[with_middleware(guard = authorize(&call_context(), &[Resource::System(SystemResourceAction::Capabilities)]))]
     async fn capabilities(&self) -> ApiResult<CapabilitiesResponse> {
         let assets = ASSETS.with(|asset| asset.borrow().clone());
+        let system = read_system_info();
 
         Ok(CapabilitiesResponse {
             capabilities: CapabilitiesDTO {
+                name: system.get_name().to_string(),
                 version: SYSTEM_VERSION.to_string(),
                 supported_assets: assets.into_iter().map(|asset| asset.into()).collect(),
             },
diff --git a/core/station/impl/src/controllers/system.rs b/core/station/impl/src/controllers/system.rs
index 6a5cb60be..8de0f137d 100644
--- a/core/station/impl/src/controllers/system.rs
+++ b/core/station/impl/src/controllers/system.rs
@@ -71,9 +71,8 @@ impl SystemController {
 
     #[cfg(any(not(feature = "canbench"), test))]
     async fn initialize(&self, input: station_api::SystemInit) {
-        let ctx = &call_context();
         self.system_service
-            .init_canister(input, ctx)
+            .init_canister(input)
             .await
             .unwrap_or_else(|err| {
                 trap(&format!("Error: initializing canister failed {err}"));
diff --git a/core/station/impl/src/controllers/user.rs b/core/station/impl/src/controllers/user.rs
index 20056f145..74779ad8b 100644
--- a/core/station/impl/src/controllers/user.rs
+++ b/core/station/impl/src/controllers/user.rs
@@ -134,10 +134,9 @@ mod tests {
             .add_user(AddUserOperationInput {
                 groups: vec![],
                 identities: vec![identity],
-                name: None,
+                name: "user-1".to_string(),
                 status: UserStatus::Active,
             })
-            .await
             .expect("Failed to add user");
 
         set_mock_caller(identity);
@@ -156,10 +155,9 @@ mod tests {
             .add_user(AddUserOperationInput {
                 groups: vec![[0; 16]],
                 identities: vec![identity],
-                name: None,
+                name: "user-1".to_string(),
                 status: UserStatus::Active,
             })
-            .await
             .expect("Failed to add user");
 
         set_mock_caller(identity);
diff --git a/core/station/impl/src/core/constants.rs b/core/station/impl/src/core/constants.rs
index f64fa2c66..231231fa6 100644
--- a/core/station/impl/src/core/constants.rs
+++ b/core/station/impl/src/core/constants.rs
@@ -7,8 +7,8 @@ pub const MAX_BYTE_SIZE_UUID: u32 = std::mem::size_of::<Uuid>() as u32;
 /// Represents one gigabyte.
 pub const GIB: u64 = 1 << 30;
 
-/// The maximum memory size the canister can use for stable memory, currently set to 32GiB.
-pub const MAX_STABLE_MEMORY_SIZE: u64 = 32 * GIB;
+/// The maximum memory size the canister can use for stable memory, currently set to 64GiB.
+pub const MAX_STABLE_MEMORY_SIZE: u64 = 64 * GIB;
 
 /// Canisters use 64KiB pages for Wasm memory, more details in the PR that introduced this constant:
 /// - https://github.com/WebAssembly/design/pull/442#issuecomment-153203031
diff --git a/core/station/impl/src/core/init.rs b/core/station/impl/src/core/init.rs
index 1fa42d8fa..5793ac1f2 100644
--- a/core/station/impl/src/core/init.rs
+++ b/core/station/impl/src/core/init.rs
@@ -15,7 +15,7 @@ lazy_static! {
     pub static ref DEFAULT_PERMISSIONS: Vec<(Allow, Resource)> = vec![
         // all authenticated users can read the capabilities of the canister
         (
-            Allow::authenticated(),
+            Allow::public(),
             Resource::System(SystemResourceAction::Capabilities),
         ),
         // Admins can read the system info which includes the canister's version, cycles, etc.
diff --git a/core/station/impl/src/errors/mod.rs b/core/station/impl/src/errors/mod.rs
index 8dcaf66b5..0c7f92652 100644
--- a/core/station/impl/src/errors/mod.rs
+++ b/core/station/impl/src/errors/mod.rs
@@ -53,8 +53,8 @@ pub use authorization::*;
 mod pagination;
 pub use pagination::*;
 
-mod install;
-pub use install::*;
+mod system;
+pub use system::*;
 
 mod change_canister;
 pub use change_canister::*;
diff --git a/core/station/impl/src/errors/install.rs b/core/station/impl/src/errors/system.rs
similarity index 86%
rename from core/station/impl/src/errors/install.rs
rename to core/station/impl/src/errors/system.rs
index ed2d204de..fb8faccb2 100644
--- a/core/station/impl/src/errors/install.rs
+++ b/core/station/impl/src/errors/system.rs
@@ -4,7 +4,7 @@ use thiserror::Error;
 
 /// Container for canister install errors.
 #[derive(Error, Debug, Eq, PartialEq, Clone)]
-pub enum InstallError {
+pub enum SystemError {
     /// The initialization of the canister failed.
     #[error(r#"The initialization of the canister failed due to {reason}"#)]
     InitFailed { reason: String },
@@ -12,11 +12,11 @@ pub enum InstallError {
     NoAdminsSpecified,
 }
 
-impl DetailableError for InstallError {
+impl DetailableError for SystemError {
     fn details(&self) -> Option<HashMap<String, String>> {
         let mut details = HashMap::new();
         match self {
-            InstallError::InitFailed { reason } => {
+            SystemError::InitFailed { reason } => {
                 details.insert("reason".to_string(), reason.to_string());
 
                 Some(details)
diff --git a/core/station/impl/src/factories/requests/add_user.rs b/core/station/impl/src/factories/requests/add_user.rs
index a81bcab58..c6e3daa33 100644
--- a/core/station/impl/src/factories/requests/add_user.rs
+++ b/core/station/impl/src/factories/requests/add_user.rs
@@ -52,7 +52,6 @@ impl Execute for AddUserRequestExecute<'_, '_> {
     async fn execute(&self) -> Result<RequestExecuteStage, RequestExecuteError> {
         let user = USER_SERVICE
             .add_user(self.operation.input.clone())
-            .await
             .map_err(|e| RequestExecuteError::Failed {
                 reason: format!("Failed to create user: {}", e),
             })?;
diff --git a/core/station/impl/src/mappers/system.rs b/core/station/impl/src/mappers/system.rs
index 03e357975..bc9c8b650 100644
--- a/core/station/impl/src/mappers/system.rs
+++ b/core/station/impl/src/mappers/system.rs
@@ -4,6 +4,7 @@ use orbit_essentials::utils::{raw_rand_successful, timestamp_to_rfc3339};
 impl SystemInfo {
     pub fn to_dto(&self, cycles: &u64, version: &str) -> station_api::SystemInfoDTO {
         station_api::SystemInfoDTO {
+            name: self.get_name().to_string(),
             last_upgrade_timestamp: timestamp_to_rfc3339(&self.get_last_upgrade_timestamp()),
             upgrader_id: *self.get_upgrader_canister_id(),
             cycles: *cycles,
diff --git a/core/station/impl/src/mappers/user.rs b/core/station/impl/src/mappers/user.rs
index b710eb19e..541491e13 100644
--- a/core/station/impl/src/mappers/user.rs
+++ b/core/station/impl/src/mappers/user.rs
@@ -53,7 +53,7 @@ impl From<User> for BasicUserDTO {
     fn from(user: User) -> Self {
         BasicUserDTO {
             id: Uuid::from_bytes(user.id).hyphenated().to_string(),
-            name: user.name.unwrap_or("".to_string()),
+            name: user.name,
             status: user.status.into(),
         }
     }
@@ -102,7 +102,7 @@ impl User {
         }
 
         if let Some(new_name) = input.name {
-            self.name = Some(new_name);
+            self.name = new_name;
         }
 
         if let Some(new_status) = input.status {
diff --git a/core/station/impl/src/models/indexes/name_to_user_id_index.rs b/core/station/impl/src/models/indexes/name_to_user_id_index.rs
index eb9cffd3b..2f13c6dd7 100644
--- a/core/station/impl/src/models/indexes/name_to_user_id_index.rs
+++ b/core/station/impl/src/models/indexes/name_to_user_id_index.rs
@@ -19,15 +19,11 @@ pub struct NameToUserIdIndexCriteria {
 }
 
 impl User {
-    pub fn to_index_by_name(&self) -> Option<NameToUserIdIndex> {
-        if let Some(name) = self.name.as_ref() {
-            return Some(NameToUserIdIndex {
-                name: format_unique_string(name),
-                user_id: self.id,
-            });
+    pub fn to_index_by_name(&self) -> NameToUserIdIndex {
+        NameToUserIdIndex {
+            name: format_unique_string(&self.name.clone()),
+            user_id: self.id,
         }
-
-        None
     }
 }
 
@@ -38,22 +34,20 @@ mod tests {
     #[test]
     fn test_name_to_user_id_association() {
         let mut user = mock_user();
-        user.name = Some("testuser".to_string());
+        user.name = "testuser".to_string();
 
         let index = user.to_index_by_name();
-        let index = index.unwrap();
 
-        assert_eq!(index.name, user.name.unwrap());
+        assert_eq!(index.name, user.name);
         assert_eq!(index.user_id, user.id);
     }
 
     #[test]
     fn test_name_is_formatted() {
         let mut user = mock_user();
-        user.name = Some("Test User".to_string());
+        user.name = "Test User".to_string();
 
         let index = user.to_index_by_name();
-        let index = index.unwrap();
 
         assert_eq!(index.name, "testuser");
     }
diff --git a/core/station/impl/src/models/indexes/request_resource_index.rs b/core/station/impl/src/models/indexes/request_resource_index.rs
index 77fed3179..6d15ee6a2 100644
--- a/core/station/impl/src/models/indexes/request_resource_index.rs
+++ b/core/station/impl/src/models/indexes/request_resource_index.rs
@@ -66,7 +66,7 @@ mod tests {
             input: AddUserOperationInput {
                 groups: vec![],
                 identities: vec![],
-                name: None,
+                name: "user-1".to_string(),
                 status: UserStatus::Active,
             },
             user_id: None,
diff --git a/core/station/impl/src/models/request.rs b/core/station/impl/src/models/request.rs
index 53337e6d3..ce434f1b9 100644
--- a/core/station/impl/src/models/request.rs
+++ b/core/station/impl/src/models/request.rs
@@ -81,7 +81,7 @@ pub struct RequestCallerPrivileges {
 #[derive(Deserialize, Debug, Clone)]
 pub struct RequestAdditionalInfo {
     pub id: UUID,
-    pub requester_name: Option<String>,
+    pub requester_name: String,
     pub approvers: Vec<DisplayUser>,
     pub evaluation_result: Option<RequestEvaluationResult>,
 }
@@ -479,7 +479,7 @@ mod tests {
         validate_request_operation_foreign_keys(&RequestOperation::AddUser(AddUserOperation {
             user_id: None,
             input: AddUserOperationInput {
-                name: None,
+                name: "user-1".to_string(),
                 identities: vec![],
                 groups: vec![[1; 16]],
                 status: crate::models::UserStatus::Active,
diff --git a/core/station/impl/src/models/request_operation.rs b/core/station/impl/src/models/request_operation.rs
index cc359df4a..03ebca79e 100644
--- a/core/station/impl/src/models/request_operation.rs
+++ b/core/station/impl/src/models/request_operation.rs
@@ -167,7 +167,7 @@ pub struct AddUserOperation {
 #[storable]
 #[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct AddUserOperationInput {
-    pub name: Option<String>,
+    pub name: String,
     pub identities: Vec<Principal>,
     pub groups: Vec<UUID>,
     pub status: UserStatus,
diff --git a/core/station/impl/src/models/request_specifier.rs b/core/station/impl/src/models/request_specifier.rs
index dd9e986cf..d5bc08c90 100644
--- a/core/station/impl/src/models/request_specifier.rs
+++ b/core/station/impl/src/models/request_specifier.rs
@@ -418,7 +418,7 @@ mod tests {
                 RequestOperation::AddUser(AddUserOperation {
                     user_id: None,
                     input: AddUserOperationInput {
-                        name: None,
+                        name: "user-1".to_string(),
                         identities: vec![],
                         groups: vec![],
                         status: UserStatus::Active,
diff --git a/core/station/impl/src/models/system.rs b/core/station/impl/src/models/system.rs
index ca2579baa..a751ed0ff 100644
--- a/core/station/impl/src/models/system.rs
+++ b/core/station/impl/src/models/system.rs
@@ -21,6 +21,8 @@ pub const SYSTEM_STATE_MEMORY_SIZE: u32 = WASM_PAGE_SIZE * SYSTEM_STATE_WASM_PAG
 #[storable(size = SYSTEM_STATE_MEMORY_SIZE)]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SystemInfo {
+    /// The system name.
+    name: String,
     /// Last time the canister was upgraded or initialized.
     last_upgrade_timestamp: Timestamp,
     /// An optionally pending change canister request.
@@ -34,6 +36,7 @@ pub struct SystemInfo {
 impl Default for SystemInfo {
     fn default() -> Self {
         Self {
+            name: "Station".to_string(),
             last_upgrade_timestamp: time(),
             change_canister_request: None,
             upgrader_canister_id: None,
@@ -43,6 +46,8 @@ impl Default for SystemInfo {
 }
 
 impl SystemInfo {
+    pub const MAX_NAME_LENGTH: usize = 48;
+
     pub fn new(upgrader_canister_id: Principal, upgrader_wasm_module: Vec<u8>) -> Self {
         Self {
             upgrader_canister_id: Some(upgrader_canister_id),
@@ -51,6 +56,23 @@ impl SystemInfo {
         }
     }
 
+    pub fn get_name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn set_name(&mut self, name: String) {
+        let mut name = name.trim().to_string();
+        if name.is_empty() {
+            name = "Station".to_string();
+        }
+
+        if name.len() > Self::MAX_NAME_LENGTH {
+            name = name.chars().take(Self::MAX_NAME_LENGTH).collect();
+        }
+
+        self.name = name;
+    }
+
     pub fn get_last_upgrade_timestamp(&self) -> Timestamp {
         self.last_upgrade_timestamp
     }
@@ -126,3 +148,32 @@ impl Storable for SystemState {
         is_fixed_size: false,
     };
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_system_info_name_validation() {
+        let mut info = SystemInfo::default();
+        assert_eq!(info.name, "Station");
+
+        info.set_name("test".to_string());
+        assert_eq!(info.name, "test");
+
+        info.set_name("".to_string());
+        assert_eq!(info.name, "Station");
+
+        info.set_name("a".repeat(SystemInfo::MAX_NAME_LENGTH + 1));
+        assert_eq!(info.name, "a".repeat(SystemInfo::MAX_NAME_LENGTH));
+
+        info.set_name("  test  ".to_string());
+        assert_eq!(info.name, "test");
+
+        info.set_name("test  ".to_string());
+        assert_eq!(info.name, "test");
+
+        info.set_name("  test".to_string());
+        assert_eq!(info.name, "test");
+    }
+}
diff --git a/core/station/impl/src/models/user.rs b/core/station/impl/src/models/user.rs
index 684739ced..83faf5569 100644
--- a/core/station/impl/src/models/user.rs
+++ b/core/station/impl/src/models/user.rs
@@ -22,7 +22,7 @@ pub struct User {
     /// The user id, which is a UUID.
     pub id: UserId,
     /// The name of the user (if any).
-    pub name: Option<String>,
+    pub name: String,
     /// The user status within the system (e.g. active, inactive, etc.)
     pub status: UserStatus,
     /// The identities associated with the user.
@@ -48,7 +48,7 @@ pub struct UserCallerPrivileges {
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct DisplayUser {
     pub id: UUID,
-    pub name: Option<String>,
+    pub name: String,
 }
 
 impl User {
@@ -108,13 +108,11 @@ fn validate_groups(group_ids: &[UUID]) -> ModelValidatorResult<UserError> {
     Ok(())
 }
 
-fn validate_name(name: &Option<String>) -> ModelValidatorResult<UserError> {
-    if let Some(name) = name {
-        if name.len() > User::MAX_NAME_LENGTH as usize {
-            return Err(UserError::NameTooLong {
-                max_length: User::MAX_NAME_LENGTH as usize,
-            });
-        }
+fn validate_name(name: &str) -> ModelValidatorResult<UserError> {
+    if name.len() > User::MAX_NAME_LENGTH as usize {
+        return Err(UserError::NameTooLong {
+            max_length: User::MAX_NAME_LENGTH as usize,
+        });
     }
 
     Ok(())
@@ -259,7 +257,7 @@ mod tests {
     #[test]
     fn fail_user_name_too_long() {
         let mut user = mock_user();
-        user.name = Some("a".repeat(User::MAX_NAME_LENGTH as usize + 1));
+        user.name = "a".repeat(User::MAX_NAME_LENGTH as usize + 1);
 
         let result = validate_name(&user.name);
 
@@ -275,7 +273,7 @@ mod tests {
     #[test]
     fn test_user_name_validation() {
         let mut user = mock_user();
-        user.name = Some("a".repeat(User::MAX_NAME_LENGTH as usize));
+        user.name = "a".repeat(User::MAX_NAME_LENGTH as usize);
 
         let result = validate_name(&user.name);
 
@@ -295,7 +293,7 @@ pub mod user_test_utils {
             id: *Uuid::new_v4().as_bytes(),
             identities: vec![Principal::from_slice(&[24; 29])],
             groups: vec![],
-            name: None,
+            name: "test".to_string(),
             status: UserStatus::Active,
             last_modification_timestamp: 0,
         }
diff --git a/core/station/impl/src/repositories/user.rs b/core/station/impl/src/repositories/user.rs
index be236fdcf..8883f8c3b 100644
--- a/core/station/impl/src/repositories/user.rs
+++ b/core/station/impl/src/repositories/user.rs
@@ -77,8 +77,8 @@ impl Repository<UserKey, User> for UserRepository {
                 });
             self.name_index
                 .refresh_index_on_modification(RefreshIndexMode::Value {
-                    previous: prev.clone().and_then(|prev| prev.to_index_by_name()),
-                    current: value.to_index_by_name(),
+                    previous: prev.clone().map(|prev| prev.to_index_by_name()),
+                    current: Some(value.to_index_by_name()),
                 });
 
             prev
@@ -112,7 +112,7 @@ impl Repository<UserKey, User> for UserRepository {
                 });
             self.name_index
                 .refresh_index_on_modification(RefreshIndexMode::CleanupValue {
-                    current: prev.clone().and_then(|prev| prev.to_index_by_name()),
+                    current: prev.clone().map(|prev| prev.to_index_by_name()),
                 });
 
             prev
@@ -179,9 +179,9 @@ impl UserRepository {
 
         if let Some(search_term) = filters.search_term {
             users.retain(|user| {
-                user.name.as_ref().map_or(false, |name| {
-                    name.to_lowercase().starts_with(&search_term.to_lowercase())
-                })
+                user.name
+                    .to_lowercase()
+                    .starts_with(&search_term.to_lowercase())
             });
         }
 
diff --git a/core/station/impl/src/services/request.rs b/core/station/impl/src/services/request.rs
index 2e4499841..00c36a3b8 100644
--- a/core/station/impl/src/services/request.rs
+++ b/core/station/impl/src/services/request.rs
@@ -102,27 +102,27 @@ impl RequestService {
         request: &Request,
         with_evaluation_results: bool,
     ) -> ServiceResult<RequestAdditionalInfo> {
-        let requester = self
-            .user_service
-            .get_user(&request.requested_by)
-            .map(|user| user.name)
-            .unwrap_or(None);
+        let requester = self.user_service.get_user(&request.requested_by);
         let approvers = request
             .approvals
             .iter()
-            .map(|approval| {
-                self.user_service
-                    .get_user(&approval.approver_id)
-                    .map(|user| DisplayUser {
+            .filter_map(
+                |approval| match self.user_service.get_user(&approval.approver_id) {
+                    Ok(user) => Some(DisplayUser {
                         name: user.name,
                         id: user.id,
-                    })
-                    .unwrap_or(DisplayUser {
-                        id: approval.approver_id,
-                        name: None,
-                    })
-            })
-            .collect();
+                    }),
+                    Err(_) => {
+                        print(format!(
+                            "Failed to get user with id {}",
+                            Uuid::from_bytes(approval.approver_id.to_owned()).hyphenated()
+                        ));
+
+                        None
+                    }
+                },
+            )
+            .collect::<Vec<DisplayUser>>();
 
         let evaluation_result = with_evaluation_results
             .then(|| {
@@ -134,7 +134,7 @@ impl RequestService {
 
         Ok(RequestAdditionalInfo {
             id: request.id,
-            requester_name: requester,
+            requester_name: requester.map_or("Unknown".to_string(), |user| user.name),
             approvers,
             evaluation_result,
         })
@@ -770,7 +770,7 @@ mod tests {
             input: AddUserOperationInput {
                 groups: vec![],
                 identities: vec![Principal::from_slice(&[3; 29])],
-                name: None,
+                name: "user-1".to_string(),
                 status: UserStatus::Active,
             },
         });
diff --git a/core/station/impl/src/services/system.rs b/core/station/impl/src/services/system.rs
index f90fe131d..8094ee62a 100644
--- a/core/station/impl/src/services/system.rs
+++ b/core/station/impl/src/services/system.rs
@@ -5,9 +5,9 @@ use crate::{
             next_time,
         },
         metrics::recompute_metrics,
-        read_system_info, read_system_state, write_system_info, CallContext,
+        read_system_info, read_system_state, write_system_info,
     },
-    errors::InstallError,
+    errors::SystemError,
     models::{
         system::{SystemInfo, SystemState},
         RequestId, RequestKey, RequestStatus,
@@ -130,7 +130,6 @@ impl SystemService {
             // registers the default canister configurations such as policies and user groups.
             print("Adding initial canister configurations");
             install_canister_handlers::init_post_process().await?;
-            install_canister_handlers::set_admins(init.admins.unwrap_or_default()).await?;
 
             print("Deploying upgrader canister");
             let canister_id = self_canister_id();
@@ -185,17 +184,22 @@ impl SystemService {
     /// Initializes the canister with the given owners and settings.
     ///
     /// Must only be called within a canister init call.
-    pub async fn init_canister(&self, input: SystemInit, ctx: &CallContext) -> ServiceResult<()> {
-        let system_info = SystemInfo::default();
-        let admins = match &input.admins {
-            Some(admins) => admins.to_owned(),
-            None => vec![ctx.caller()],
-        };
+    pub async fn init_canister(&self, input: SystemInit) -> ServiceResult<()> {
+        let mut system_info = SystemInfo::default();
 
-        if admins.is_empty() {
-            return Err(InstallError::NoAdminsSpecified)?;
+        if input.admins.is_empty() {
+            return Err(SystemError::NoAdminsSpecified)?;
         }
 
+        // adds the default admin group
+        init_canister_sync_handlers::add_admin_group();
+
+        // registers the admins of the canister
+        init_canister_sync_handlers::set_admins(input.admins.clone())?;
+
+        // sets the name of the canister
+        system_info.set_name(input.name.clone());
+
         // Handles the post init process in a one-off timer to allow for inter canister calls,
         // this adds the default canister configurations, deploys the station upgrader and makes sure
         // there are no unintended controllers of the canister.
@@ -215,7 +219,7 @@ impl SystemService {
         let mut system_info = read_system_info();
         let input = match input {
             Some(input) => input,
-            None => SystemUpgrade {},
+            None => SystemUpgrade { name: None },
         };
 
         // verifies that the upgrade request exists and marks it as completed
@@ -246,6 +250,12 @@ impl SystemService {
             write_system_info(system_info.clone());
         }
 
+        if let Some(name) = &input.name {
+            system_info.set_name(name.clone());
+
+            write_system_info(system_info.clone());
+        }
+
         // Handles the post upgrade process in a one-off timer to allow for inter canister calls,
         // this upgrades the upgrader canister if a new upgrader module is provided.
         self.install_canister_post_process(system_info, SystemInstall::Upgrade(input));
@@ -254,31 +264,67 @@ impl SystemService {
     }
 }
 
+mod init_canister_sync_handlers {
+    use crate::core::ic_cdk::{api::print, next_time};
+    use crate::models::{AddUserOperationInput, UserStatus};
+    use crate::services::USER_SERVICE;
+    use crate::{
+        models::{UserGroup, ADMIN_GROUP_ID},
+        repositories::USER_GROUP_REPOSITORY,
+    };
+    use orbit_essentials::api::ApiError;
+    use orbit_essentials::repository::Repository;
+    use station_api::AdminInitInput;
+    use uuid::Uuid;
+
+    pub fn add_admin_group() {
+        // adds the admin group which is used as the default group for admins during the canister instantiation
+        USER_GROUP_REPOSITORY.insert(
+            ADMIN_GROUP_ID.to_owned(),
+            UserGroup {
+                id: ADMIN_GROUP_ID.to_owned(),
+                name: "Admin".to_owned(),
+                last_modification_timestamp: next_time(),
+            },
+        );
+    }
+
+    /// Registers the newly added admins of the canister.
+    pub fn set_admins(admins: Vec<AdminInitInput>) -> Result<(), ApiError> {
+        print(format!("Registering {} admin users", admins.len()));
+        for admin in admins {
+            let user = USER_SERVICE.add_user(AddUserOperationInput {
+                identities: vec![admin.identity.to_owned()],
+                groups: vec![ADMIN_GROUP_ID.to_owned()],
+                name: admin.name.to_owned(),
+                status: UserStatus::Active,
+            })?;
+
+            print(&format!(
+                "Added admin user with principal {} and user id {}",
+                admin.identity.to_text(),
+                Uuid::from_bytes(user.id).hyphenated()
+            ));
+        }
+        Ok(())
+    }
+}
+
 #[cfg(target_arch = "wasm32")]
 mod install_canister_handlers {
     use crate::core::ic_cdk::api::{id as self_canister_id, print};
-    use crate::core::ic_cdk::next_time;
     use crate::core::init::{DEFAULT_PERMISSIONS, DEFAULT_REQUEST_POLICIES};
     use crate::core::INITIAL_UPGRADER_CYCLES;
-    use crate::models::{
-        AddRequestPolicyOperationInput, AddUserOperationInput, EditPermissionOperationInput,
-        UserStatus,
-    };
+    use crate::models::{AddRequestPolicyOperationInput, EditPermissionOperationInput};
+    use crate::services::permission::PERMISSION_SERVICE;
     use crate::services::REQUEST_POLICY_SERVICE;
-    use crate::services::{permission::PERMISSION_SERVICE, USER_SERVICE};
-    use crate::{
-        models::{UserGroup, ADMIN_GROUP_ID},
-        repositories::USER_GROUP_REPOSITORY,
-    };
     use candid::{Encode, Principal};
     use canfund::fetch::cycles::FetchCyclesBalanceFromCanisterStatus;
     use canfund::manager::options::{EstimatedRuntime, FundManagerOptions, FundStrategy};
     use canfund::FundManager;
     use ic_cdk::api::management_canister::main::{self as mgmt};
-    use orbit_essentials::repository::Repository;
     use std::cell::RefCell;
     use std::sync::Arc;
-    use uuid::Uuid;
 
     thread_local! {
         pub static FUND_MANAGER: RefCell<FundManager> = RefCell::new(FundManager::new());
@@ -286,16 +332,6 @@ mod install_canister_handlers {
 
     /// Registers the default configurations for the canister.
     pub async fn init_post_process() -> Result<(), String> {
-        // adds the admin group which is used as the default group for admins during the canister instantiation
-        USER_GROUP_REPOSITORY.insert(
-            ADMIN_GROUP_ID.to_owned(),
-            UserGroup {
-                id: ADMIN_GROUP_ID.to_owned(),
-                name: "Admin".to_owned(),
-                last_modification_timestamp: next_time(),
-            },
-        );
-
         // adds the default request policies which sets safe defaults for the canister
         for policy in DEFAULT_REQUEST_POLICIES.iter() {
             REQUEST_POLICY_SERVICE
@@ -369,29 +405,6 @@ mod install_canister_handlers {
         .map_err(|e| format!("Failed to set station controller: {:?}", e))
     }
 
-    /// Registers the newly added admins of the canister.
-    pub async fn set_admins(admins: Vec<Principal>) -> Result<(), String> {
-        print(&format!("Registering {:?} admin users", admins.len()));
-        for admin in admins {
-            let user = USER_SERVICE
-                .add_user(AddUserOperationInput {
-                    identities: vec![admin.to_owned()],
-                    groups: vec![ADMIN_GROUP_ID.to_owned()],
-                    name: None,
-                    status: UserStatus::Active,
-                })
-                .await
-                .map_err(|e| format!("Failed to register admin user: {:?}", e))?;
-
-            print(&format!(
-                "Added admin user with principal {:?} and user id {:?}",
-                admin.to_text(),
-                Uuid::from_bytes(user.id).hyphenated().to_string()
-            ));
-        }
-        Ok(())
-    }
-
     /// Starts the fund manager service setting it up to monitor the upgrader canister cycles and top it up if needed.
     pub fn monitor_upgrader_cycles(upgrader_id: Principal) {
         print(format!(
@@ -427,20 +440,19 @@ mod tests {
     use super::*;
     use crate::models::request_test_utils::mock_request;
     use candid::Principal;
+    use station_api::AdminInitInput;
 
     #[tokio::test]
     async fn canister_init() {
-        let caller = Principal::from_slice(&[1; 29]);
-        let ctx = CallContext::new(caller);
-
         let result = SYSTEM_SERVICE
-            .init_canister(
-                SystemInit {
-                    admins: Some(vec![Principal::from_slice(&[1; 29])]),
-                    upgrader_wasm_module: vec![],
-                },
-                &ctx,
-            )
+            .init_canister(SystemInit {
+                name: "Station".to_string(),
+                admins: vec![AdminInitInput {
+                    name: "Admin".to_string(),
+                    identity: Principal::from_slice(&[1; 29]),
+                }],
+                upgrader_wasm_module: vec![],
+            })
             .await;
 
         assert!(result.is_ok());
diff --git a/core/station/impl/src/services/user.rs b/core/station/impl/src/services/user.rs
index 3af8b4e16..e12a2d20d 100644
--- a/core/station/impl/src/services/user.rs
+++ b/core/station/impl/src/services/user.rs
@@ -1,7 +1,6 @@
 use crate::{
     core::{
         authorization::Authorization,
-        generate_uuid_v4,
         utils::{paginated_items, retain_accessible_resources, PaginatedData, PaginatedItemsArgs},
         CallContext,
     },
@@ -98,17 +97,14 @@ impl UserService {
     /// Creates a new user with the given user details and returns the created user.
     ///
     /// This method should only be called by a system call (self canister call or controller).
-    pub async fn add_user(&self, input: AddUserOperationInput) -> ServiceResult<User> {
+    pub fn add_user(&self, input: AddUserOperationInput) -> ServiceResult<User> {
         for identity in input.identities.iter() {
             self.assert_identity_has_no_associated_user(identity, None)?;
         }
 
-        if let Some(name) = &input.name {
-            self.assert_name_has_no_associated_user(name, None)?;
-        }
+        self.assert_name_has_no_associated_user(&input.name, None)?;
 
-        let user_id = generate_uuid_v4().await;
-        let user = UserMapper::from_create_input(*user_id.as_bytes(), input);
+        let user = UserMapper::from_create_input(*Uuid::new_v4().as_bytes(), input);
 
         user.validate()?;
 
@@ -339,17 +335,17 @@ mod tests {
         assert!(result.is_err());
     }
 
-    #[tokio::test]
-    async fn add_user_happy_path() {
+    #[test]
+    fn add_user_happy_path() {
         let ctx: TestContext = setup();
         let input = AddUserOperationInput {
             identities: vec![Principal::from_slice(&[2; 29])],
             groups: vec![*ADMIN_GROUP_ID],
             status: UserStatus::Active,
-            name: None,
+            name: "user-1".to_string(),
         };
 
-        let result = ctx.service.add_user(input).await;
+        let result = ctx.service.add_user(input);
         assert!(result.is_ok());
 
         let user = ctx.repository.get(&result.unwrap().to_key()).unwrap();
@@ -357,8 +353,8 @@ mod tests {
         assert_eq!(user.groups, vec![*ADMIN_GROUP_ID]);
     }
 
-    #[tokio::test]
-    async fn add_user_non_existent_group_should_fail() {
+    #[test]
+    fn add_user_non_existent_group_should_fail() {
         let ctx: TestContext = setup();
 
         disable_mock_resource_validation();
@@ -367,10 +363,10 @@ mod tests {
             identities: vec![Principal::from_slice(&[2; 29])],
             groups: vec![[0; 16]],
             status: UserStatus::Active,
-            name: None,
+            name: "user-1".to_string(),
         };
 
-        let result = ctx.service.add_user(input).await;
+        let result = ctx.service.add_user(input);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -378,27 +374,27 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn add_user_with_identity_of_existing_user_should_fail() {
+    #[test]
+    fn add_user_with_identity_of_existing_user_should_fail() {
         let ctx: TestContext = setup();
         let input = AddUserOperationInput {
             identities: vec![Principal::from_slice(&[2; 29])],
             groups: vec![*ADMIN_GROUP_ID],
             status: UserStatus::Active,
-            name: Some("Jane Doe".to_string()),
+            name: "Jane Doe".to_string(),
         };
 
-        let result = ctx.service.add_user(input).await;
+        let result = ctx.service.add_user(input);
         assert!(result.is_ok());
 
         let input = AddUserOperationInput {
             identities: vec![Principal::from_slice(&[2; 29])],
             groups: vec![*ADMIN_GROUP_ID],
             status: UserStatus::Active,
-            name: Some("John Doe".to_string()),
+            name: "John Doe".to_string(),
         };
 
-        let result = ctx.service.add_user(input).await;
+        let result = ctx.service.add_user(input);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -406,10 +402,10 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn add_user_with_existing_name_should_fail() {
+    #[test]
+    fn add_user_with_existing_name_should_fail() {
         let mut user = mock_user();
-        user.name = Some("Jane Doe".to_string());
+        user.name = "Jane Doe".to_string();
 
         USER_REPOSITORY.insert(user.to_key(), user.clone());
 
@@ -417,10 +413,10 @@ mod tests {
             identities: vec![Principal::from_slice(&[3; 29])],
             groups: vec![*ADMIN_GROUP_ID],
             status: UserStatus::Active,
-            name: Some("Jane Doe".to_string()),
+            name: "Jane Doe".to_string(),
         };
 
-        let result = USER_SERVICE.add_user(input).await;
+        let result = USER_SERVICE.add_user(input);
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -431,16 +427,16 @@ mod tests {
     #[tokio::test]
     async fn edit_user_with_existing_name_should_fail() {
         let mut user = mock_user();
-        user.name = Some("Jane Doe".to_string());
+        user.name = "Jane Doe".to_string();
         let mut another_user = mock_user();
-        another_user.name = Some("John Doe".to_string());
+        another_user.name = "John Doe".to_string();
 
         USER_REPOSITORY.insert(user.to_key(), user.clone());
         USER_REPOSITORY.insert(another_user.to_key(), another_user.clone());
 
         let input = EditUserOperationInput {
             user_id: user.id,
-            name: another_user.name,
+            name: Some(another_user.name),
             identities: None,
             groups: None,
             status: None,
diff --git a/tests/integration/src/control_panel_tests.rs b/tests/integration/src/control_panel_tests.rs
index bc5d8f7db..2a0d68781 100644
--- a/tests/integration/src/control_panel_tests.rs
+++ b/tests/integration/src/control_panel_tests.rs
@@ -2,9 +2,9 @@ use crate::setup::setup_new_env;
 use crate::utils::{controller_test_id, user_test_id};
 use crate::TestEnv;
 use control_panel_api::{
-    DeployStationResponse, GetMainStationResponse, ManageUserInput, ManageUserResponse,
-    RegisterUserInput, RegisterUserResponse, UpdateWaitingListInput, UserStationDTO,
-    UserSubscriptionStatusDTO,
+    DeployStationInput, DeployStationResponse, GetMainStationResponse, ManageUserInput,
+    ManageUserResponse, RegisterUserInput, RegisterUserResponse, UpdateWaitingListInput,
+    UserStationDTO, UserSubscriptionStatusDTO,
 };
 use orbit_essentials::api::ApiResult;
 use pocket_ic::update_candid_as;
@@ -32,7 +32,10 @@ fn register_user_successful() {
 
     // register user
     let register_args = RegisterUserInput {
-        station_id: Some(canister_ids.station),
+        station: Some(UserStationDTO {
+            canister_id: canister_ids.station,
+            name: "main".to_string(),
+        }),
     };
     let res: (ApiResult<RegisterUserResponse>,) = update_candid_as(
         &env,
@@ -67,7 +70,7 @@ fn deploy_user_station() {
     let user_id = user_test_id(0);
 
     // register user
-    let register_args = RegisterUserInput { station_id: None };
+    let register_args = RegisterUserInput { station: None };
     let res: (ApiResult<RegisterUserResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
@@ -79,13 +82,18 @@ fn deploy_user_station() {
     let user_dto = res.0.unwrap().user;
     assert_eq!(user_dto.identity, user_id);
 
+    let deploy_station_args = DeployStationInput {
+        station_name: "station".to_string(),
+        admin_name: "admin".to_string(),
+    };
+
     // user can't deploy station before being approved
     let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
         user_id,
         "deploy_station",
-        (),
+        (deploy_station_args,),
     )
     .unwrap();
     res.0.unwrap_err();
@@ -101,13 +109,18 @@ fn deploy_user_station() {
     .unwrap();
     res.0.unwrap();
 
+    let deploy_station_args = DeployStationInput {
+        station_name: "station".to_string(),
+        admin_name: "admin".to_string(),
+    };
+
     // user can't deploy station before being approved
     let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
         user_id,
         "deploy_station",
-        (),
+        (deploy_station_args,),
     )
     .unwrap();
     res.0.unwrap_err();
@@ -138,13 +151,18 @@ fn deploy_user_station() {
     .unwrap();
     res.0.unwrap();
 
+    let deploy_station_args = DeployStationInput {
+        station_name: "station".to_string(),
+        admin_name: "admin".to_string(),
+    };
+
     // deploy user station
     let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
         user_id,
         "deploy_station",
-        (),
+        (deploy_station_args,),
     )
     .unwrap();
     let newly_created_user_station = res.0.unwrap().canister_id;
@@ -200,7 +218,7 @@ fn deploy_too_many_stations() {
     let user_id = user_test_id(0);
 
     // register user
-    let register_args = RegisterUserInput { station_id: None };
+    let register_args = RegisterUserInput { station: None };
     let res: (ApiResult<RegisterUserResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
@@ -229,13 +247,18 @@ fn deploy_too_many_stations() {
 
     // deploy the maximum amount of user stations
     let mut stations = vec![];
-    for _ in 0..3 {
+    for i in 0..3 {
+        let deploy_station_args = DeployStationInput {
+            station_name: format!("station_{}", i),
+            admin_name: "admin".to_string(),
+        };
+
         let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
             &env,
             canister_ids.control_panel,
             user_id,
             "deploy_station",
-            (),
+            (deploy_station_args,),
         )
         .unwrap();
         stations.push(res.0.unwrap().canister_id);
@@ -253,7 +276,7 @@ fn deploy_too_many_stations() {
         main_station: Some(stations[0]),
         stations: Some(vec![UserStationDTO {
             canister_id: stations[0],
-            name: None,
+            name: "main".to_string(),
         }]),
     };
     let res: (ApiResult<ManageUserResponse>,) = update_candid_as(
@@ -267,13 +290,18 @@ fn deploy_too_many_stations() {
     let user_dto = res.0.unwrap().user;
     assert_eq!(user_dto.stations.len(), 1);
 
+    let deploy_station_args = DeployStationInput {
+        station_name: "last_station".to_string(),
+        admin_name: "admin".to_string(),
+    };
+
     // deploying an additional station should fail nonetheless
     let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
         user_id,
         "deploy_station",
-        (),
+        (deploy_station_args,),
     )
     .unwrap();
     assert_eq!(res.0.unwrap_err().code, "DEPLOY_STATION_QUOTA_EXCEEDED");
diff --git a/tests/integration/src/cycles_monitor_tests.rs b/tests/integration/src/cycles_monitor_tests.rs
index 9a43680d9..d78000914 100644
--- a/tests/integration/src/cycles_monitor_tests.rs
+++ b/tests/integration/src/cycles_monitor_tests.rs
@@ -5,8 +5,8 @@ use crate::utils::{
 };
 use crate::TestEnv;
 use control_panel_api::{
-    DeployStationResponse, RegisterUserInput, RegisterUserResponse, UpdateWaitingListInput,
-    UserSubscriptionStatusDTO,
+    DeployStationInput, DeployStationResponse, RegisterUserInput, RegisterUserResponse,
+    UpdateWaitingListInput, UserSubscriptionStatusDTO,
 };
 use orbit_essentials::api::ApiResult;
 use pocket_ic::update_candid_as;
@@ -74,7 +74,7 @@ fn successful_monitors_stations_and_tops_up() {
     let user_id = user_test_id(0);
 
     // register user
-    let register_args = RegisterUserInput { station_id: None };
+    let register_args = RegisterUserInput { station: None };
     let res: (ApiResult<RegisterUserResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
@@ -101,13 +101,18 @@ fn successful_monitors_stations_and_tops_up() {
     .unwrap();
     res.0.unwrap();
 
+    let deploy_station_args = DeployStationInput {
+        station_name: "test_station".to_string(),
+        admin_name: "admin".to_string(),
+    };
+
     // deploy user station
     let res: (ApiResult<DeployStationResponse>,) = update_candid_as(
         &env,
         canister_ids.control_panel,
         user_id,
         "deploy_station",
-        (),
+        (deploy_station_args,),
     )
     .unwrap();
     let newly_created_user_station = res.0.unwrap().canister_id;
diff --git a/tests/integration/src/register_tests.rs b/tests/integration/src/register_tests.rs
index 107a7372c..b6adab130 100644
--- a/tests/integration/src/register_tests.rs
+++ b/tests/integration/src/register_tests.rs
@@ -19,7 +19,7 @@ fn register_user_successful() {
 
     // add a user through a request
     let add_user = AddUserOperationInput {
-        name: Some("test".to_string()),
+        name: "test".to_string(),
         identities: vec![user_id],
         groups: vec![],
         status: station_api::UserStatusDTO::Active,
@@ -72,7 +72,7 @@ fn register_user_successful() {
     };
 
     if let RequestOperationDTO::AddUser(add_user) = new_request_dto.operation {
-        assert_eq!(add_user.user.unwrap().name, Some("test".to_string()));
+        assert_eq!(add_user.user.unwrap().name, "test".to_string());
     } else {
         panic!("request operation must be AddUser");
     }
diff --git a/tests/integration/src/setup.rs b/tests/integration/src/setup.rs
index 211921453..c87d3f5af 100644
--- a/tests/integration/src/setup.rs
+++ b/tests/integration/src/setup.rs
@@ -10,7 +10,7 @@ use control_panel_api::{
 use ic_cdk::api::management_canister::main::CanisterSettings;
 use ic_ledger_types::{AccountIdentifier, Tokens, DEFAULT_SUBACCOUNT};
 use pocket_ic::{PocketIc, PocketIcBuilder};
-use station_api::{SystemInit as SystemInitArg, SystemInstall as SystemInstallArg};
+use station_api::{AdminInitInput, SystemInit as SystemInitArg, SystemInstall as SystemInstallArg};
 use std::collections::{HashMap, HashSet};
 use std::env;
 use std::fs::File;
@@ -144,7 +144,11 @@ fn install_canisters(env: &mut PocketIc, controller: Principal, minter: Principa
     );
 
     let station_init_args = SystemInstallArg::Init(SystemInitArg {
-        admins: Some(vec![WALLET_ADMIN_USER]),
+        name: "Station".to_string(),
+        admins: vec![AdminInitInput {
+            identity: WALLET_ADMIN_USER,
+            name: "station-admin".to_string(),
+        }],
         upgrader_wasm_module: upgrader_wasm,
     });
     env.install_canister(
diff --git a/tests/integration/src/upgrade_station_tests.rs b/tests/integration/src/upgrade_station_tests.rs
index dd7ac27bf..798c503a0 100644
--- a/tests/integration/src/upgrade_station_tests.rs
+++ b/tests/integration/src/upgrade_station_tests.rs
@@ -29,7 +29,7 @@ fn successful_station_upgrade() {
     assert_eq!(health_status, HealthStatus::Healthy);
 
     // submit station upgrade request
-    let station_init_arg = SystemInstall::Upgrade(SystemUpgrade {});
+    let station_init_arg = SystemInstall::Upgrade(SystemUpgrade { name: None });
     let station_init_arg_bytes = Encode!(&station_init_arg).unwrap();
     let station_upgrade_operation =
         RequestOperationInput::ChangeCanister(ChangeCanisterOperationInput {
diff --git a/tests/integration/src/utils.rs b/tests/integration/src/utils.rs
index 058b7a933..212a1aaaf 100644
--- a/tests/integration/src/utils.rs
+++ b/tests/integration/src/utils.rs
@@ -211,7 +211,7 @@ pub fn add_user(
     station_canister_id: Principal,
 ) -> UserDTO {
     let add_user = RequestOperationInput::AddUser(AddUserOperationInput {
-        name: None,
+        name: user_id.to_text().to_string(),
         identities: vec![user_id],
         groups: group_ids,
         status: UserStatusDTO::Active,