diff --git a/core/client/src/features/auth/index.ts b/core/client/src/features/auth/common/index.ts
similarity index 100%
rename from core/client/src/features/auth/index.ts
rename to core/client/src/features/auth/common/index.ts
diff --git a/core/client/src/features/auth/model/composables/useTextChanging.ts b/core/client/src/features/auth/common/model/composables/useTextChanging.ts
similarity index 100%
rename from core/client/src/features/auth/model/composables/useTextChanging.ts
rename to core/client/src/features/auth/common/model/composables/useTextChanging.ts
diff --git a/core/client/src/features/auth/model/fixtures/index.ts b/core/client/src/features/auth/common/model/fixtures/index.ts
similarity index 100%
rename from core/client/src/features/auth/model/fixtures/index.ts
rename to core/client/src/features/auth/common/model/fixtures/index.ts
diff --git a/core/client/src/features/auth/model/fixtures/reviews.ts b/core/client/src/features/auth/common/model/fixtures/reviews.ts
similarity index 100%
rename from core/client/src/features/auth/model/fixtures/reviews.ts
rename to core/client/src/features/auth/common/model/fixtures/reviews.ts
diff --git a/core/client/src/features/auth/model/types.ts b/core/client/src/features/auth/common/model/types.ts
similarity index 100%
rename from core/client/src/features/auth/model/types.ts
rename to core/client/src/features/auth/common/model/types.ts
diff --git a/core/client/src/features/auth/ui/BgPanel.vue b/core/client/src/features/auth/common/ui/BgPanel.vue
similarity index 97%
rename from core/client/src/features/auth/ui/BgPanel.vue
rename to core/client/src/features/auth/common/ui/BgPanel.vue
index 59e0f9da..87c5829c 100644
--- a/core/client/src/features/auth/ui/BgPanel.vue
+++ b/core/client/src/features/auth/common/ui/BgPanel.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useDark, useWindowSize } from '@vueuse/core'
 import { computed } from 'vue'
-import { reviews } from '../model'
 import useTextChanging from '../model/composables/useTextChanging'
+import { reviews } from '../model/fixtures'
 
 const { currentIndex } = useTextChanging(reviews)
 
diff --git a/core/client/src/features/auth/ui/LogoFile.vue b/core/client/src/features/auth/common/ui/LogoFile.vue
similarity index 100%
rename from core/client/src/features/auth/ui/LogoFile.vue
rename to core/client/src/features/auth/common/ui/LogoFile.vue
diff --git a/core/client/src/features/auth/ui/PrivacyPolicy.vue b/core/client/src/features/auth/common/ui/PrivacyPolicy.vue
similarity index 77%
rename from core/client/src/features/auth/ui/PrivacyPolicy.vue
rename to core/client/src/features/auth/common/ui/PrivacyPolicy.vue
index 2b7cb984..a4597c7a 100644
--- a/core/client/src/features/auth/ui/PrivacyPolicy.vue
+++ b/core/client/src/features/auth/common/ui/PrivacyPolicy.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useRoute } from 'vue-router'
 
 const { tm, locale } = useI18n()
+const route = useRoute()
 
 // @ts-expect-error tm types
 const privacyItems = tm('authentication.privacy')
@@ -10,6 +12,10 @@ const privacyItems = tm('authentication.privacy')
 const maxWidth = computed(() => {
   return locale.value === 'ru-RU' ? '400px' : '320px'
 })
+
+const privacyChangingItem = computed(() =>
+  route.path === '/auth/sign-in' ? privacyItems[1] : privacyItems[0],
+)
 </script>
 
 <template>
@@ -17,7 +23,7 @@ const maxWidth = computed(() => {
     class="pt-2.5 text-sm text-center text-neutral-500 my-0 mx-auto select-none dark:text-neutral-400"
     :style="{ maxWidth }"
   >
-    {{ privacyItems[0] }}
+    {{ privacyChangingItem }}
     <a
       href="https://github.com/mnenie/jenda"
       target="_blank"
@@ -25,9 +31,9 @@ const maxWidth = computed(() => {
       class="cursor-pointer underline underline-offset-4 duration-100 ease-in
       hover:text-neutral-900 dark:hover:text-neutral-500"
     >
-      {{ privacyItems[1] }}
+      {{ privacyItems[2] }}
     </a>
-    {{ privacyItems[2] }}
+    {{ privacyItems[3] }}
     <a
       href="https://github.com/mnenie/jenda"
       target="_blank"
@@ -35,7 +41,7 @@ const maxWidth = computed(() => {
       class="cursor-pointer underline underline-offset-4 duration-100 ease-in
       hover:text-neutral-900 dark:hover:text-neutral-500"
     >
-      {{ privacyItems[3] }}
+      {{ privacyItems[4] }}
     </a>
   </p>
 </template>
diff --git a/core/client/src/features/auth/common/ui/index.ts b/core/client/src/features/auth/common/ui/index.ts
new file mode 100644
index 00000000..270075ec
--- /dev/null
+++ b/core/client/src/features/auth/common/ui/index.ts
@@ -0,0 +1,5 @@
+import BgPanel from './BgPanel.vue'
+import LogoFile from './LogoFile.vue'
+import PrivacyPolicy from './PrivacyPolicy.vue'
+
+export { BgPanel, LogoFile, PrivacyPolicy }
diff --git a/core/client/src/features/auth/model/index.ts b/core/client/src/features/auth/model/index.ts
deleted file mode 100644
index dc009e6c..00000000
--- a/core/client/src/features/auth/model/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './fixtures'
-export * from './validation'
diff --git a/core/client/src/features/auth/model/validation.ts b/core/client/src/features/auth/model/validation.ts
deleted file mode 100644
index abae0fc3..00000000
--- a/core/client/src/features/auth/model/validation.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as z from 'zod'
-
-export const validationRules = z.object({
-  email: z
-    .string({ required_error: 'Email is a required field' })
-    .nonempty('Email is a required field')
-    .email('Email must be a valid'),
-  password: z
-    .string({ required_error: 'Password is a required field' })
-    .nonempty('Password is a required field')
-    .min(8, 'Password must be at least 8 characters'),
-})
diff --git a/core/client/src/features/auth/oauth/index.ts b/core/client/src/features/auth/oauth/index.ts
new file mode 100644
index 00000000..ed584959
--- /dev/null
+++ b/core/client/src/features/auth/oauth/index.ts
@@ -0,0 +1 @@
+export * from './ui'
diff --git a/core/client/src/features/auth/ui/GoogleOauth.vue b/core/client/src/features/auth/oauth/ui/GoogleOauth.vue
similarity index 100%
rename from core/client/src/features/auth/ui/GoogleOauth.vue
rename to core/client/src/features/auth/oauth/ui/GoogleOauth.vue
diff --git a/core/client/src/features/auth/oauth/ui/index.ts b/core/client/src/features/auth/oauth/ui/index.ts
new file mode 100644
index 00000000..986d5abd
--- /dev/null
+++ b/core/client/src/features/auth/oauth/ui/index.ts
@@ -0,0 +1 @@
+export { default as GoogleOauth } from './GoogleOauth.vue'
diff --git a/core/client/src/features/auth/sign-in/index.ts b/core/client/src/features/auth/sign-in/index.ts
new file mode 100644
index 00000000..ed584959
--- /dev/null
+++ b/core/client/src/features/auth/sign-in/index.ts
@@ -0,0 +1 @@
+export * from './ui'
diff --git a/core/client/src/features/auth/ui/SignInForm.vue b/core/client/src/features/auth/sign-in/ui/SignInForm.vue
similarity index 82%
rename from core/client/src/features/auth/ui/SignInForm.vue
rename to core/client/src/features/auth/sign-in/ui/SignInForm.vue
index 830b4a82..59298ff0 100644
--- a/core/client/src/features/auth/ui/SignInForm.vue
+++ b/core/client/src/features/auth/sign-in/ui/SignInForm.vue
@@ -3,9 +3,20 @@ import { UiButton, UiInput } from '@/shared/ui'
 import { toTypedSchema } from '@vee-validate/zod'
 import { useField, useForm } from 'vee-validate'
 import { toast } from 'vue-sonner'
-import { validationRules } from '../model'
+import { z } from 'zod'
 
-const validationSchema = toTypedSchema(validationRules)
+const validationSchema = toTypedSchema(
+  z.object({
+    email: z
+      .string({ required_error: 'Email is a required field' })
+      .nonempty('Email is a required field')
+      .email('Email must be a valid'),
+    password: z
+      .string({ required_error: 'Password is a required field' })
+      .nonempty('Password is a required field')
+      .min(8, 'Password must be at least 8 characters'),
+  }),
+)
 
 const { handleSubmit, errors } = useForm({
   validationSchema,
@@ -55,7 +66,7 @@ const onLogin = handleSubmit((values) => {
         </div>
       </div>
       <div class="grid gap-2">
-        <UiButton>
+        <UiButton type="submit">
           {{ $t('authentication.login.btn') }}
         </UiButton>
         <p class="text-sm text-center select-none text-neutral-500 dark:text-neutral-300">
diff --git a/core/client/src/features/auth/sign-in/ui/index.ts b/core/client/src/features/auth/sign-in/ui/index.ts
new file mode 100644
index 00000000..48744dd8
--- /dev/null
+++ b/core/client/src/features/auth/sign-in/ui/index.ts
@@ -0,0 +1,3 @@
+import SignInForm from './SignInForm.vue'
+
+export { SignInForm }
diff --git a/core/client/src/features/auth/sign-up/index.ts b/core/client/src/features/auth/sign-up/index.ts
new file mode 100644
index 00000000..ed584959
--- /dev/null
+++ b/core/client/src/features/auth/sign-up/index.ts
@@ -0,0 +1 @@
+export * from './ui'
diff --git a/core/client/src/features/auth/sign-up/ui/ConfirmForm.vue b/core/client/src/features/auth/sign-up/ui/ConfirmForm.vue
new file mode 100644
index 00000000..994c4017
--- /dev/null
+++ b/core/client/src/features/auth/sign-up/ui/ConfirmForm.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { UiButton, UiPinInput, UiPinInputGroup, UiPinInputInput } from '@/shared/ui'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useField, useForm } from 'vee-validate'
+import { useRouter } from 'vue-router'
+import { toast } from 'vue-sonner'
+import { z } from 'zod'
+
+const formSchema = toTypedSchema(z.object({
+  pin: z.array(z.coerce.string()).length(5, { message: 'Invalid pin' }),
+}))
+
+const { handleSubmit, setFieldValue, errors } = useForm({
+  validationSchema: formSchema,
+  initialValues: {
+    pin: [],
+  },
+})
+
+const { value: pin } = useField<string[]>('pin')
+
+const router = useRouter()
+
+const onConfirm = handleSubmit((values) => {
+  router.push('/auth/sign-up/workspace')
+})
+
+function onResend() {
+  toast.success('OTP has been sent to your email')
+}
+</script>
+
+<template>
+  <form @submit.prevent="onConfirm">
+    <div v-auto-animate class="form-field">
+      <UiPinInput
+        id="pin-input"
+        v-model:model-value="pin"
+        placeholder="○"
+        class="flex gap-2 items-center mt-1 w-full"
+        otp
+        type="number"
+        @update:model-value="(arrStr) => {
+          setFieldValue('pin', arrStr.filter(Boolean))
+        }"
+      >
+        <UiPinInputGroup>
+          <UiPinInputInput
+            v-for="(id, index) in 5"
+            :key="id"
+            :index="index"
+          />
+        </UiPinInputGroup>
+      </UiPinInput>
+      <span
+        v-if="errors.pin"
+        class="text-xs text-red-500 !fw500"
+      >
+        {{ errors.pin }}
+      </span>
+    </div>
+    <p class="text-sm text-neutral-400 mt-2">
+      {{ $t('authentication.form.otp') }}
+    </p>
+    <UiButton type="submit" class="w-full mt-4 mb-2">
+      {{ $t('authentication.confirm.btn') }}
+    </UiButton>
+    <p
+      class="text-sm text-center select-none text-neutral-500 dark:text-neutral-300"
+      @click="onResend"
+    >
+      {{ $t('authentication.confirm.proposal') }}
+      <span
+        class="cursor-pointer underline underline-offset-4 duration-100 ease-in hover:text-neutral-900 dark:hover:text-neutral-400"
+      >
+        {{ $t('authentication.confirm.route') }}
+      </span>
+    </p>
+  </form>
+</template>
diff --git a/core/client/src/features/auth/sign-up/ui/HandleLogo.vue b/core/client/src/features/auth/sign-up/ui/HandleLogo.vue
new file mode 100644
index 00000000..ad951104
--- /dev/null
+++ b/core/client/src/features/auth/sign-up/ui/HandleLogo.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { authWorkspaceKey } from '@/shared/constants'
+import { UiButton } from '@/shared/ui'
+import { inject } from 'vue'
+
+const { openFileChooser, reset } = inject(authWorkspaceKey)!
+</script>
+
+<template>
+  <div class="flex items-center gap-2">
+    <UiButton size="sm" variant="outline" @click="openFileChooser($event)">
+      {{ $t('authentication.workspace.logo.btn', 1) }}
+    </UiButton>
+    <UiButton size="sm" variant="outline" class="!text-red-500" @click="reset">
+      {{ $t('authentication.workspace.logo.btn', 2) }}
+    </UiButton>
+  </div>
+</template>
diff --git a/core/client/src/features/auth/ui/SignUpForm.vue b/core/client/src/features/auth/sign-up/ui/SignUpForm.vue
similarity index 82%
rename from core/client/src/features/auth/ui/SignUpForm.vue
rename to core/client/src/features/auth/sign-up/ui/SignUpForm.vue
index 4ec8da25..cf5f71ab 100644
--- a/core/client/src/features/auth/ui/SignUpForm.vue
+++ b/core/client/src/features/auth/sign-up/ui/SignUpForm.vue
@@ -3,9 +3,20 @@ import { UiButton, UiInput } from '@/shared/ui'
 import { toTypedSchema } from '@vee-validate/zod'
 import { useField, useForm } from 'vee-validate'
 import { useRouter } from 'vue-router'
-import { validationRules } from '../model'
+import { z } from 'zod'
 
-const validationSchema = toTypedSchema(validationRules)
+const validationSchema = toTypedSchema(
+  z.object({
+    email: z
+      .string({ required_error: 'Email is a required field' })
+      .nonempty('Email is a required field')
+      .email('Email must be a valid'),
+    password: z
+      .string({ required_error: 'Password is a required field' })
+      .nonempty('Password is a required field')
+      .min(8, 'Password must be at least 8 characters'),
+  }),
+)
 
 const { handleSubmit, errors } = useForm({
   validationSchema,
@@ -57,7 +68,7 @@ const onRegistration = handleSubmit((values) => {
         </div>
       </div>
       <div class="grid gap-2">
-        <UiButton>
+        <UiButton type="submit">
           {{ $t('authentication.registration.btn') }}
         </UiButton>
         <p class="text-sm text-center select-none text-neutral-500 dark:text-neutral-300">
diff --git a/core/client/src/features/auth/sign-up/ui/WorkspaceForm.vue b/core/client/src/features/auth/sign-up/ui/WorkspaceForm.vue
new file mode 100644
index 00000000..d6751306
--- /dev/null
+++ b/core/client/src/features/auth/sign-up/ui/WorkspaceForm.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import { UiButton, UiInput } from '@/shared/ui'
+import { toTypedSchema } from '@vee-validate/zod'
+import { useField, useForm } from 'vee-validate'
+import { useRouter } from 'vue-router'
+import { z } from 'zod'
+
+const validationSchema = toTypedSchema(
+  z.object({
+    name: z
+      .string({ required_error: 'Name is a required field' })
+      .nonempty('Name is a required field'),
+    link: z
+      .string({ required_error: 'Link is a required field' })
+      .nonempty('Link is a required field')
+      .min(3, 'Link must be at least 3 characters'),
+  }),
+)
+
+const { handleSubmit, errors } = useForm({
+  validationSchema,
+})
+const { value: name } = useField<string>('name')
+const { value: link } = useField<string>('link')
+
+const router = useRouter()
+
+const onWorkspaceCreation = handleSubmit((values) => {
+  // on registration event
+  router.push('/boards')
+})
+</script>
+
+<template>
+  <form @submit.prevent="onWorkspaceCreation">
+    <div class="grid gap-6">
+      <div class="grid gap-4">
+        <div v-auto-animate class="form-field">
+          <label
+            class="form-label"
+            for="name"
+          >
+            {{ $t('authentication.workspace.form.name.label') }}
+          </label>
+          <UiInput
+            id="name"
+            v-model="name"
+            :placeholder="$t('authentication.workspace.form.name.placeholder')"
+          />
+          <span
+            v-if="errors.name"
+            class="text-xs text-red-500 !fw500"
+          >
+            {{ errors.name }}
+          </span>
+        </div>
+        <div v-auto-animate class="form-field">
+          <label
+            class="form-label"
+            for="link"
+          >
+            {{ $t('authentication.workspace.form.link.label') }}
+          </label>
+          <div class="relative w-full h-9 flex items-center">
+            <span class="text-sm pb-0.5px text-neutral-500 absolute left-3">workpaces/</span>
+            <UiInput id="link" v-model="link" class="pl-89px" type="text" />
+          </div>
+          <span
+            v-if="errors.link"
+            class="text-xs text-red-500 !fw500"
+          >
+            {{ errors.link }}
+          </span>
+        </div>
+      </div>
+      <UiButton type="submit">
+        {{ $t('authentication.workspace.route') }}
+      </UiButton>
+    </div>
+  </form>
+</template>
diff --git a/core/client/src/features/auth/sign-up/ui/index.ts b/core/client/src/features/auth/sign-up/ui/index.ts
new file mode 100644
index 00000000..830fe02c
--- /dev/null
+++ b/core/client/src/features/auth/sign-up/ui/index.ts
@@ -0,0 +1,6 @@
+import ConfirmForm from './ConfirmForm.vue'
+import HandleLogo from './HandleLogo.vue'
+import SignUpForm from './SignUpForm.vue'
+import WorkspaceForm from './WorkspaceForm.vue'
+
+export { ConfirmForm, HandleLogo, SignUpForm, WorkspaceForm }
diff --git a/core/client/src/features/auth/ui/ConfirmForm.vue b/core/client/src/features/auth/ui/ConfirmForm.vue
deleted file mode 100644
index ec8bdbe9..00000000
--- a/core/client/src/features/auth/ui/ConfirmForm.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<script setup lang="ts">
-import { UiButton, UiPinInput, UiPinInputGroup, UiPinInputInput } from '@/shared/ui'
-</script>
-
-<template>
-  <form @submit.prevent>
-    <UiPinInput
-      id="pin-input"
-      placeholder="○"
-      class="flex gap-2 items-center mt-1 w-full"
-      otp
-      type="number"
-    >
-      <UiPinInputGroup>
-        <UiPinInputInput
-          v-for="(id, index) in 5"
-          :key="id"
-          :index="index"
-        />
-      </UiPinInputGroup>
-    </UiPinInput>
-    <p class="text-sm text-neutral-400 mt-2">
-      {{ $t('authentication.form.otp') }}
-    </p>
-    <UiButton type="submit" class="w-full mt-4 mb-2">
-      {{ $t('authentication.confirm.btn') }}
-    </UiButton>
-    <p class="text-sm text-center select-none text-neutral-500 dark:text-neutral-300">
-      {{ $t('authentication.confirm.proposal') }}
-      <span
-        class="cursor-pointer underline underline-offset-4 duration-100 ease-in hover:text-neutral-900 dark:hover:text-neutral-400"
-      >
-        {{ $t('authentication.confirm.route') }}
-      </span>
-    </p>
-  </form>
-</template>
diff --git a/core/client/src/features/auth/ui/index.ts b/core/client/src/features/auth/ui/index.ts
deleted file mode 100644
index 8998edba..00000000
--- a/core/client/src/features/auth/ui/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import BgPanel from './BgPanel.vue'
-import ConfirmForm from './ConfirmForm.vue'
-import GoogleOauth from './GoogleOauth.vue'
-import LogoFile from './LogoFile.vue'
-import PrivacyPolicy from './PrivacyPolicy.vue'
-import SignInForm from './SignInForm.vue'
-import SignUpForm from './SignUpForm.vue'
-
-export { BgPanel, ConfirmForm, GoogleOauth, LogoFile, PrivacyPolicy, SignInForm, SignUpForm }
diff --git a/core/client/src/layouts/ui/AuthLayout.vue b/core/client/src/layouts/ui/AuthLayout.vue
index 79c67d15..4c2a8bdd 100644
--- a/core/client/src/layouts/ui/AuthLayout.vue
+++ b/core/client/src/layouts/ui/AuthLayout.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { BgPanel } from '@/features/auth'
+import { BgPanel } from '@/features/auth/common'
 </script>
 
 <template>
diff --git a/core/client/src/pages/auth/sign-in.vue b/core/client/src/pages/auth/sign-in.vue
index b175ea0d..31fdaa45 100644
--- a/core/client/src/pages/auth/sign-in.vue
+++ b/core/client/src/pages/auth/sign-in.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { SignInForm } from '@/features/auth'
+import { SignInForm } from '@/features/auth/sign-in'
 import { LayoutsEnum } from '@/layouts/model'
 import { AuthContainer } from '@/widgets/auth'
 import { useHead } from '@unhead/vue'
diff --git a/core/client/src/pages/auth/sign-up/confirm.vue b/core/client/src/pages/auth/sign-up/confirm.vue
index 08510d9e..4d5817e4 100644
--- a/core/client/src/pages/auth/sign-up/confirm.vue
+++ b/core/client/src/pages/auth/sign-up/confirm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ConfirmForm } from '@/features/auth'
+import { ConfirmForm } from '@/features/auth/sign-up'
 import { LayoutsEnum } from '@/layouts/model'
 import { ConfirmSection } from '@/widgets/auth'
 import { useHead } from '@unhead/vue'
@@ -7,7 +7,7 @@ import { useHead } from '@unhead/vue'
 definePage({
   meta: {
     layout: LayoutsEnum.auth,
-    requiresAuth: false,
+    requiresAuth: true,
   },
 })
 useHead({
diff --git a/core/client/src/pages/auth/sign-up/index.vue b/core/client/src/pages/auth/sign-up/index.vue
index e27f9aeb..b37ae28a 100644
--- a/core/client/src/pages/auth/sign-up/index.vue
+++ b/core/client/src/pages/auth/sign-up/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { SignUpForm } from '@/features/auth'
+import { SignUpForm } from '@/features/auth/sign-up'
 import { LayoutsEnum } from '@/layouts/model'
 import { AuthContainer } from '@/widgets/auth'
 import { useHead } from '@unhead/vue'
diff --git a/core/client/src/pages/auth/sign-up/workspace.vue b/core/client/src/pages/auth/sign-up/workspace.vue
index 907ee529..ab1dde22 100644
--- a/core/client/src/pages/auth/sign-up/workspace.vue
+++ b/core/client/src/pages/auth/sign-up/workspace.vue
@@ -1,23 +1,29 @@
 <script setup lang="ts">
+import { WorkspaceForm } from '@/features/auth/sign-up'
 import { LayoutsEnum } from '@/layouts/model'
-import { AuthContainer } from '@/widgets/auth'
+import { WorkspaceLogoChooser, WorkspaceSection } from '@/widgets/auth'
 import { useHead } from '@unhead/vue'
 
 definePage({
   meta: {
     layout: LayoutsEnum.auth,
-    requiresAuth: false,
+    requiresAuth: true,
   },
 })
 useHead({
-  title: 'Jenda | Create Workspace',
+  title: 'Sign Up | Create Workspace',
 })
 </script>
 
 <template>
   <div class="auth-page">
-    <AuthContainer>
-      worspace
-    </AuthContainer>
+    <WorkspaceSection>
+      <template #logo>
+        <WorkspaceLogoChooser />
+      </template>
+      <template #form>
+        <WorkspaceForm />
+      </template>
+    </WorkspaceSection>
   </div>
 </template>
diff --git a/core/client/src/shared/composables/useExpanded.ts b/core/client/src/shared/composables/useExpanded.ts
index e54c7d85..07994554 100644
--- a/core/client/src/shared/composables/useExpanded.ts
+++ b/core/client/src/shared/composables/useExpanded.ts
@@ -1,10 +1,10 @@
-import { inject, type InjectionKey, provide, type Ref, toRef } from 'vue'
+import { inject, provide, type Ref, toRef } from 'vue'
+import { expandedKey } from '../constants'
 
 interface Expanded {
   isExpanded: Ref<boolean>
   onToggleArea: () => void
 }
-const expandedKey: InjectionKey<Expanded> = Symbol('expanded')
 
 export function useExpanded() {
   const createExpandedContext = (expanded: Expanded) => {
diff --git a/core/client/src/shared/config/types-shared.ts b/core/client/src/shared/config/types-shared.ts
index 915fe5ff..c83fca91 100644
--- a/core/client/src/shared/config/types-shared.ts
+++ b/core/client/src/shared/config/types-shared.ts
@@ -1,4 +1,15 @@
 import type { IconifyIcon } from '@iconify/vue'
+import type { Ref } from 'vue'
+
+export interface Expanded {
+  isExpanded: Ref<boolean>
+  onToggleArea: () => void
+}
+
+export interface AuthWorkspace {
+  reset: () => void
+  openFileChooser: (event: any) => void
+}
 
 interface Path {
   pathName: string
diff --git a/core/client/src/shared/constants/index.ts b/core/client/src/shared/constants/index.ts
new file mode 100644
index 00000000..9a769a9f
--- /dev/null
+++ b/core/client/src/shared/constants/index.ts
@@ -0,0 +1,5 @@
+import type { InjectionKey } from 'vue'
+import type { AuthWorkspace, Expanded } from '../config/types-shared'
+
+export const expandedKey = Symbol('expanded') as InjectionKey<Expanded>
+export const authWorkspaceKey = Symbol('auth-workspace') as InjectionKey<AuthWorkspace>
diff --git a/core/client/src/shared/libs/i18n/locales/en-US.ts b/core/client/src/shared/libs/i18n/locales/en-US.ts
index 01798c65..664e8777 100644
--- a/core/client/src/shared/libs/i18n/locales/en-US.ts
+++ b/core/client/src/shared/libs/i18n/locales/en-US.ts
@@ -189,14 +189,32 @@ export default {
       route: 'Sign In Now',
     },
     confirm: {
-      title: 'Confirm Your Email',
+      title: 'Confirm your email',
       description: 'Enter the confirmation code sent to your email',
       btn: 'Confirm',
       alert: 'We care about your security. You can trust us to keep your information safe and secure!',
       proposal: 'Didn\'t receive the code?',
       route: 'Resend',
     },
-
+    workspace: {
+      title: 'Create your workspace',
+      logo: {
+        label: 'Choose a logo for your workspace',
+        btn: 'Choose image | Delete',
+        description: '*.png, *.jpeg files up to 10MB at least 400px by 400px',
+      },
+      alert: 'Remember, if you don’t choose a logo, jenda will automatically generate one for you',
+      form: {
+        name: {
+          label: 'Name',
+          placeholder: 'Enter your workspace name',
+        },
+        link: {
+          label: 'Custom link',
+        },
+      },
+      route: 'Continue',
+    },
     form: {
       email: 'Email',
       password: 'Password',
@@ -205,6 +223,7 @@ export default {
     line: 'Or continue with',
     privacy: [
       'By clicking continue, you agree to our',
+      'By clicking sign in, you agree to our',
       'Terms of Service',
       'and',
       'Privacy Policy.',
diff --git a/core/client/src/shared/libs/i18n/locales/ru-RU.ts b/core/client/src/shared/libs/i18n/locales/ru-RU.ts
index 5d499d5d..2dda87e9 100644
--- a/core/client/src/shared/libs/i18n/locales/ru-RU.ts
+++ b/core/client/src/shared/libs/i18n/locales/ru-RU.ts
@@ -2,7 +2,7 @@ export default {
   sidebar: {
     badge: 'free',
     input: 'Поиск',
-    section: 'раб. пространство',
+    section: 'воркспейс',
     projects: 'проекты',
     boards: 'Канбаны',
     templates: 'Шаблоны',
@@ -187,7 +187,7 @@ export default {
     registration: {
       title: 'Создайте аккаунт',
       description: 'Введите свои данные ниже, чтобы создать аккаунт',
-      btn: 'Далее',
+      btn: 'Продолжить',
       proposal: 'Уже есть аккаунт?',
       route: 'Войдите',
     },
@@ -199,6 +199,25 @@ export default {
       proposal: 'Не получили код?',
       route: 'Отправить повторно',
     },
+    workspace: {
+      title: 'Создайте воркспейс',
+      logo: {
+        label: 'Выберите логотип',
+        btn: 'Выбрать картинку | Удалить',
+        description: '*.png, *.jpeg до 10 МБ, размером не менее 400 x 400 пикселей',
+      },
+      alert: 'Помните, если вы не выберете лого, то jenda автоматически создаст его для вас',
+      form: {
+        name: {
+          label: 'Название',
+          placeholder: 'Введите название',
+        },
+        link: {
+          label: 'Удобная ссылка',
+        },
+      },
+      route: 'Продолжить',
+    },
     form: {
       email: 'Почта',
       password: 'Пароль',
@@ -206,7 +225,8 @@ export default {
     },
     line: 'Или продолжите с',
     privacy: [
-      'Нажав продолжить, вы соглашаетесь с нашими',
+      'Нажав на продолжить, вы соглашаетесь с нашими',
+      'Нажав на кнопку "войти", вы соглашаетесь с нашими',
       'Условиями предоставления услуг',
       'и',
       'Политикой конфиденциальности.',
diff --git a/core/client/src/shared/libs/i18n/locales/zh-CN.ts b/core/client/src/shared/libs/i18n/locales/zh-CN.ts
index 3ad1c5be..61e1b584 100644
--- a/core/client/src/shared/libs/i18n/locales/zh-CN.ts
+++ b/core/client/src/shared/libs/i18n/locales/zh-CN.ts
@@ -190,13 +190,32 @@ export default {
       proposal: '没有收到验证码？',
       route: '重新发送',
     },
+    workspace: {
+      title: '创建工作区',
+      logo: {
+        label: '为您的工作区选择一个标志',
+        btn: '选择图片 | 删除',
+        description: '文件 *.png, *.jpeg，最大 10MB，尺寸至少为 400x400 像素',
+      },
+      alert: '请记住，如果您未选择标志，Jenda 将自动为您生成一个',
+      form: {
+        name: {
+          label: '名称',
+          placeholder: '输入您的工作区名称',
+        },
+        link: {
+          label: '自定义链接',
+        },
+      },
+      route: '立即登录',
+    },
     form: {
       email: '电子邮件',
       password: '密码',
       otp: '您应输入一串单个数字的值。',
     },
     line: '或继续使用',
-    privacy: ['点击继续即表示您同意我们的', '服务条款', '和', '隐私政策。'],
+    privacy: ['点击继续即表示您同意我们的', '点击登录即表示您同意我们的', '服务条款', '和', '隐私政策。'],
     back: '回到首页',
     auth_alert: '通过 google 的授权将在 2024 年 12 月 28 日后被 gitlab 替代',
   },
diff --git a/core/client/src/widgets/auth/ui/AuthContainer.vue b/core/client/src/widgets/auth/ui/AuthContainer.vue
index 68076e7f..7ed67a97 100644
--- a/core/client/src/widgets/auth/ui/AuthContainer.vue
+++ b/core/client/src/widgets/auth/ui/AuthContainer.vue
@@ -1,24 +1,21 @@
 <script setup lang="ts">
-import { GoogleOauth, LogoFile, PrivacyPolicy } from '@/features/auth'
+import { LogoFile, PrivacyPolicy } from '@/features/auth/common'
+import { GoogleOauth } from '@/features/auth/oauth'
 import { UiAlert } from '@/shared/ui'
-import { useDark, useWindowSize } from '@vueuse/core'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const { t } = useI18n()
-const { width } = useWindowSize()
-
-const isDark = useDark()
 
 const title = computed(() => {
-  return route.path === '/auth/sign-in'
+  return route.name === '/auth/sign-in'
     ? t('authentication.login.title')
     : t('authentication.registration.title')
 })
 const info = computed(() => {
-  return route.path === '/auth/sign-in'
+  return route.name === '/auth/sign-in'
     ? t('authentication.login.description')
     : t('authentication.registration.description')
 })
@@ -40,11 +37,10 @@ const alertString = computed(() => {
     <div class="h-full w-full flex flex-col justify-center items-center mx-auto">
       <LogoFile />
       <div
-        class="relative flex w-460px flex-col gap-2
-          max-[520px]:!w-full max-[1100px]:!w-460px max-[1200px]:w-360px"
+        class="form-container"
       >
         <UiAlert
-          v-if="route.path === '/auth/sign-in' || route.path === '/auth/sign-up'"
+          v-if="route.name === '/auth/sign-in' || route.name === '/auth/sign-up/'"
           variant="warning"
           closable
           class="max-w-98% max-[520px]:mb-1.5"
diff --git a/core/client/src/widgets/auth/ui/ConfirmSection.vue b/core/client/src/widgets/auth/ui/ConfirmSection.vue
index bc86d76c..c524ddb9 100644
--- a/core/client/src/widgets/auth/ui/ConfirmSection.vue
+++ b/core/client/src/widgets/auth/ui/ConfirmSection.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { LogoFile } from '@/features/auth'
+import { LogoFile } from '@/features/auth/common'
 import { UiAlert } from '@/shared/ui'
 </script>
 
@@ -10,8 +10,7 @@ import { UiAlert } from '@/shared/ui'
     <div class="h-full w-full flex flex-col justify-center items-center mx-auto">
       <LogoFile />
       <div
-        class="relative flex w-460px flex-col gap-2
-          max-[520px]:!w-full max-[1100px]:!w-460px max-[1200px]:w-360px"
+        class="form-container"
       >
         <h2 class="text-3xl fw-600 max-[580px]:text-2xl">
           {{ $t('authentication.confirm.title') }}
diff --git a/core/client/src/widgets/auth/ui/WorkspaceLogoChooser.vue b/core/client/src/widgets/auth/ui/WorkspaceLogoChooser.vue
new file mode 100644
index 00000000..d66a23fb
--- /dev/null
+++ b/core/client/src/widgets/auth/ui/WorkspaceLogoChooser.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { HandleLogo } from '@/features/auth/sign-up'
+import { authWorkspaceKey } from '@/shared/constants'
+import { useFileSystemAccess, useObjectUrl } from '@vueuse/core'
+import { provide, shallowRef, toValue } from 'vue'
+
+const url = shallowRef()
+
+// TODO: add fileSize validation
+const { file, open } = useFileSystemAccess({
+  dataType: 'Blob',
+  types: [
+    {
+      description: 'Image',
+      accept: {
+        'image/*': ['.png', '.jpeg'],
+      },
+    },
+  ],
+  excludeAcceptAllOption: true,
+},
+)
+function reset() {
+  file.value = undefined
+  url.value = null
+}
+
+async function openFileChooser() {
+  await open()
+  url.value = toValue(useObjectUrl(file))
+}
+
+provide(authWorkspaceKey, {
+  openFileChooser,
+  reset,
+})
+</script>
+
+<template>
+  <div class="flex items-center justify-start gap-6">
+    <img
+      :src="url ?? 'https://avatars.githubusercontent.com/u/148716815?v=4'"
+      class="h-16 w-16 rounded-md"
+    />
+    <div class="flex flex-col gap-2">
+      <span class="text-sm text-neutral-500 dark:text-neutral-400">
+        {{ $t('authentication.workspace.logo.label') }}
+      </span>
+      <HandleLogo />
+      <span class="mt-1 text-xs text-neutral-500 dark:text-neutral-400">
+        {{ $t('authentication.workspace.logo.description') }}
+      </span>
+    </div>
+  </div>
+</template>
diff --git a/core/client/src/widgets/auth/ui/WorkspaceSection.vue b/core/client/src/widgets/auth/ui/WorkspaceSection.vue
new file mode 100644
index 00000000..8cc5468e
--- /dev/null
+++ b/core/client/src/widgets/auth/ui/WorkspaceSection.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import { LogoFile, PrivacyPolicy } from '@/features/auth/common'
+import { UiAlert } from '@/shared/ui'
+</script>
+
+<template>
+  <div
+    class="auth-slot-container"
+  >
+    <div class="h-full w-full flex flex-col justify-center items-center mx-auto">
+      <LogoFile />
+      <div
+        class="form-container"
+      >
+        <h2 class="text-3xl fw-600 max-[580px]:text-2xl mb-6">
+          {{ $t('authentication.workspace.title') }}
+        </h2>
+        <div class="mb-4">
+          <slot name="logo" />
+        </div>
+        <UiAlert
+          variant="warning"
+          closable
+          :content="$t('authentication.workspace.alert')"
+          class="max-w-98% mb-6 mt-2 max-[520px]:mb-1.5"
+        />
+        <slot name="form" />
+        <PrivacyPolicy />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/core/client/src/widgets/auth/ui/index.ts b/core/client/src/widgets/auth/ui/index.ts
index 1e636d49..129285e6 100644
--- a/core/client/src/widgets/auth/ui/index.ts
+++ b/core/client/src/widgets/auth/ui/index.ts
@@ -1,4 +1,6 @@
 import AuthContainer from './AuthContainer.vue'
 import ConfirmSection from './ConfirmSection.vue'
+import WorkspaceLogoChooser from './WorkspaceLogoChooser.vue'
+import WorkspaceSection from './WorkspaceSection.vue'
 
-export { AuthContainer, ConfirmSection }
+export { AuthContainer, ConfirmSection, WorkspaceLogoChooser, WorkspaceSection }
diff --git a/core/client/uno.config.ts b/core/client/uno.config.ts
index ec126b7d..d160349a 100644
--- a/core/client/uno.config.ts
+++ b/core/client/uno.config.ts
@@ -46,6 +46,7 @@ export default defineConfig({
       'form-label': 'text-sm text-neutral-900 !fw500 dark:text-neutral-200',
       'auth-page': 'h-full flex w-68% max-[1440px]:w-80% max-[1100px]:!w-full',
       'auth-slot-container': 'relative h-full w-full mx-auto px-2rem dark:bg-#1c1c1c',
+      'form-container': 'relative flex w-460px flex-col gap-2 max-[520px]:!w-full max-[1100px]:!w-460px max-[1200px]:w-360px',
     },
     {
       'bg-main': 'bg-white dark:bg-#262626',