diff --git a/PRODUCT.md b/PRODUCT.md
index 32202e1..939a272 100644
--- a/PRODUCT.md
+++ b/PRODUCT.md
@@ -10,7 +10,7 @@ Young adults (18–35) in Russian-speaking markets looking for genuine human con
 
 ## Product Purpose
 
-Daiting is a dating app for meaningful connections. It replaces the swipe-factory aesthetic with an editorial, intentional experience. Success = users move from match to real-world date, and the app gets out of the way once that happens.
+Dating is a dating app for meaningful connections. It replaces the swipe-factory aesthetic with an editorial, intentional experience. Success = users move from match to real-world date, and the app gets out of the way once that happens.
 
 ## Brand Personality
 
diff --git a/README.md b/README.md
index 79d7f9c..e6c35a7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Daiting — Frontend
+# Dating — Frontend
 
 Vue 3 + Vite + Tauri v2. Работает как PWA в браузере и как нативное десктопное приложение (Windows / macOS / Linux).
 
@@ -39,7 +39,7 @@ cd dating-app-frontend
 # Установить зависимости
 pnpm install
 
-# Запустить в браузере (порт 1420)
+# Запустить в браузере (порт 3000) (old 1420)
 pnpm dev
 
 # Запустить с Tauri (нативное окно)
@@ -272,7 +272,7 @@ const feed = await apiClient.api.feedControllerGetFeed({
 ## Скрипты
 
 ```bash
-pnpm dev              # Vite dev server, порт 1420
+pnpm dev              # Vite dev server, порт 3000
 pnpm build            # vue-tsc + vite build → dist/
 pnpm preview          # Превью prod-сборки
 pnpm tauri dev        # Tauri dev window (запускает pnpm dev внутри)
diff --git a/dating-app-frontend-prompt.md b/dating-app-frontend-prompt.md
index 0c786d2..1be5f32 100644
--- a/dating-app-frontend-prompt.md
+++ b/dating-app-frontend-prompt.md
@@ -2,7 +2,7 @@
 
 ## Context & Orientation
 
-You are building the complete frontend for a dating application called **Daiting**. The backend is already implemented. The generated API client lives at `src/api/api.ts` — use it as the source of truth for all endpoint shapes, DTOs, and types. Do not re-declare types that already exist in the API client; import them.
+You are building the complete frontend for a dating application called **Dating**. The backend is already implemented. The generated API client lives at `src/api/api.ts` — use it as the source of truth for all endpoint shapes, DTOs, and types. Do not re-declare types that already exist in the API client; import them.
 
 Project root: `C:\MyApps\dating-app-frontend`
 Package manager: **pnpm**
diff --git a/index.html b/index.html
index 35d7ad8..23cb104 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Daiting</title>
+    <title>Dating</title>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index f2b8b08..55d4af4 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dating-app"
 version = "0.1.0"
-description = "Daiting — dating app frontend"
+description = "Dating — dating app frontend"
 authors = []
 edition = "2021"
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 92fe920..5750c54 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,18 +1,18 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "Daiting",
+  "productName": "Dating",
   "version": "0.1.0",
-  "identifier": "com.daiting.app",
+  "identifier": "com.dating.app",
   "build": {
     "beforeDevCommand": "pnpm dev",
-    "devUrl": "http://localhost:1420",
+    "devUrl": "http://localhost:3000",
     "beforeBuildCommand": "pnpm build",
     "frontendDist": "../dist"
   },
   "app": {
     "windows": [
       {
-        "title": "Daiting",
+        "title": "dating",
         "width": 1280,
         "height": 860,
         "minWidth": 375,
diff --git a/src/api/client.ts b/src/api/client.ts
index 51ab5d6..2392c3f 100644
--- a/src/api/client.ts
+++ b/src/api/client.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';
 import { Api, HttpClient } from './api';
 
-const BASE_URL = import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000';
+const BASE_URL = import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:1337';
 
 // ─── Raw axios instance with interceptors ────────────────────────────────────
 
@@ -36,7 +36,12 @@ function _processQueue(error: unknown, token: string | null) {
 }
 
 axiosInstance.interceptors.response.use(
-  (response) => response,
+  (response) => {
+    if (response.data !== null && typeof response.data === 'object' && 'data' in response.data) {
+      response.data = response.data.data;
+    }
+    return response;
+  },
   async (error) => {
     const originalRequest = error.config as InternalAxiosRequestConfig & { _retry?: boolean };
 
@@ -62,11 +67,11 @@ axiosInstance.interceptors.response.use(
       }
 
       try {
-        const res = await axios.post<{ accessToken: string; refreshToken: string }>(
+        const res = await axios.post<{ data: { accessToken: string; refreshToken: string } }>(
           `${BASE_URL}/api/v1/auth/refresh`,
           { refreshToken },
         );
-        const { accessToken, refreshToken: newRefresh } = res.data;
+        const { accessToken, refreshToken: newRefresh } = res.data.data;
         _setAccessToken(accessToken);
         localStorage.setItem('refreshToken', newRefresh);
         _processQueue(null, accessToken);
diff --git a/src/components/layout/SideNav.vue b/src/components/layout/SideNav.vue
index b4fcc08..218546f 100644
--- a/src/components/layout/SideNav.vue
+++ b/src/components/layout/SideNav.vue
@@ -50,7 +50,7 @@ function toggle() {
     <div class="sidenav__header">
       <span class="sidenav__logo">D</span>
       <Transition name="fade">
-        <span v-if="uiStore.sidebarExpanded" class="sidenav__brand">Daiting</span>
+        <span v-if="uiStore.sidebarExpanded" class="sidenav__brand">Dating</span>
       </Transition>
     </div>
 
diff --git a/src/components/layout/TauriTitlebar.vue b/src/components/layout/TauriTitlebar.vue
index 9402751..7d43321 100644
--- a/src/components/layout/TauriTitlebar.vue
+++ b/src/components/layout/TauriTitlebar.vue
@@ -31,7 +31,7 @@ async function closeWindow() {
     class="titlebar"
     data-tauri-drag-region
   >
-    <span class="titlebar__brand">Daiting</span>
+    <span class="titlebar__brand">Dating</span>
     <div class="titlebar__controls">
       <button class="titlebar__btn titlebar__btn--minimize" @click="minimize" aria-label="Свернуть" />
       <button class="titlebar__btn titlebar__btn--maximize" @click="maximize" aria-label="Развернуть" />
diff --git a/src/stores/auth.store.ts b/src/stores/auth.store.ts
index 50ab341..aa5a09e 100644
--- a/src/stores/auth.store.ts
+++ b/src/stores/auth.store.ts
@@ -43,25 +43,20 @@ export const useAuthStore = defineStore('auth', () => {
     const res = await apiClient.api.authControllerLogin(dto) as unknown as {
       accessToken: string;
       refreshToken: string;
-      user: AuthUser;
     };
     _setAccessToken(res.accessToken);
     localStorage.setItem('refreshToken', res.refreshToken);
-    user.value = res.user;
-    if (res.user.profiles.length > 0) {
-      activeProfileId.value = res.user.profiles[0].id;
-    }
+    await fetchMe();
   }
 
   async function register(dto: RegisterDto) {
     const res = await apiClient.api.authControllerRegister(dto) as unknown as {
       accessToken: string;
       refreshToken: string;
-      user: AuthUser;
     };
     _setAccessToken(res.accessToken);
     localStorage.setItem('refreshToken', res.refreshToken);
-    user.value = res.user;
+    await fetchMe();
   }
 
   async function logout() {
@@ -78,7 +73,7 @@ export const useAuthStore = defineStore('auth', () => {
   async function fetchMe() {
     const res = await apiClient.api.usersControllerGetMe() as unknown as AuthUser;
     user.value = res;
-    if (res.profiles.length > 0 && !activeProfileId.value) {
+    if (res.profiles?.length > 0 && !activeProfileId.value) {
       activeProfileId.value = res.profiles[0].id;
     }
   }
diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index 5923eab..baf797d 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -47,7 +47,7 @@ async function submit() {
     <div class="auth-page__grain" aria-hidden="true" />
 
     <div class="auth-card">
-      <div class="auth-card__wordmark">Daiting</div>
+      <div class="auth-card__wordmark">Dating</div>
       <h1 class="auth-card__heading">С возвращением</h1>
       <p class="auth-card__sub">Войдите, чтобы продолжить</p>
 
diff --git a/src/views/auth/RegisterView.vue b/src/views/auth/RegisterView.vue
index 60ec000..b97d624 100644
--- a/src/views/auth/RegisterView.vue
+++ b/src/views/auth/RegisterView.vue
@@ -57,7 +57,7 @@ async function submit() {
     <div class="auth-page__grain" aria-hidden="true" />
 
     <div class="auth-card">
-      <div class="auth-card__wordmark">Daiting</div>
+      <div class="auth-card__wordmark">Dating</div>
       <h1 class="auth-card__heading">Создать аккаунт</h1>
       <p class="auth-card__sub">Начните своё путешествие</p>
 
diff --git a/vite.config.ts b/vite.config.ts
index e85c9d3..f1e8d02 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,7 +32,7 @@ export default defineConfig(async () => ({
   // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
   clearScreen: false,
   server: {
-    port: 1420,
+    port: 3000,
     strictPort: true,
     host: host || false,
     hmr: host