diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index 56af1bd3d7..d90777acdf 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -51,6 +51,7 @@ runs:
       shell: bash
 
     - name: "Bootstrap project"
+      if: ${{ runner.os != 'Windows' }}
       run: |
         if [[ ! -z "${{ inputs.bootstrap-packages }}" ]]
         then
@@ -59,3 +60,13 @@ runs:
             lerna bootstrap
         fi
       shell: bash
+
+    - name: "Bootstrap project on windows"
+      if: ${{ runner.os == 'Windows' }}
+      run: |
+        if ( "${{ inputs.bootstrap-packages }}" ) {
+          lerna bootstrap --scope '{${{ inputs.bootstrap-packages }},}'
+        } else {
+          lerna bootstrap
+        }
+      shell: powershell
diff --git a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
index 4f35bf8199..27f3a9a038 100644
Binary files a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg and b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg differ
diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 6bae30f594..1f41fdd237 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -38,7 +38,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -59,7 +59,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
diff --git a/.github/workflows/check-desktop-visual-regression.yml b/.github/workflows/check-desktop-visual-regression.yml
index d29e0efb8d..f86cfc14fd 100644
--- a/.github/workflows/check-desktop-visual-regression.yml
+++ b/.github/workflows/check-desktop-visual-regression.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required to retrieve git history
 
@@ -31,4 +31,4 @@ jobs:
         with:
           workingDir: ./packages/desktop
           token: ${{ secrets.GH_TOKEN }}
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          projectToken: 3218757eee04
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 4b951fd4e0..7a05a53f69 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -16,7 +16,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Remove test files workaround (jest types conflicting with cypress types)"
         if: ${{ runner.os == 'Windows' }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 090aaa8b24..07ee9e671c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,11 +41,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
+        uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           category: "/language:${{matrix.language}}"
\ No newline at end of file
diff --git a/.github/workflows/depencency-review.yml b/.github/workflows/depencency-review.yml
index 23044f791b..7989380270 100644
--- a/.github/workflows/depencency-review.yml
+++ b/.github/workflows/depencency-review.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@0efb1d1d84fc9633afcdaad14c485cbbc90ef46c # v2.5.1
\ No newline at end of file
+        uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index c3e0fcf512..44822900ff 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -34,7 +34,7 @@ jobs:
       CHECKSUM_PATH: ${{ github.event.action == 'released' && 'packages/desktop/dist/latest-linux.yml' || 'packages/desktop/dist/alpha-linux.yml' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
@@ -105,7 +105,7 @@ jobs:
       S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions-rs/components-nightly@v1
         with:
@@ -153,7 +153,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 
@@ -178,7 +178,7 @@ jobs:
       S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Fetch jsign"
         shell: bash
@@ -217,7 +217,7 @@ jobs:
 
       # - name: E2E - Extract version
       #   id: extract_version
-      #   uses: Saionaro/extract-package-version@v1.1.1
+      #   uses: Saionaro/extract-package-version@v1.2.1
       #   with:
       #     path: packages/desktop
 
@@ -274,7 +274,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 
diff --git a/.github/workflows/desktop-test-scroll.yml b/.github/workflows/desktop-test-scroll.yml
index 6e59c8e3f7..bb9a6c6a7c 100644
--- a/.github/workflows/desktop-test-scroll.yml
+++ b/.github/workflows/desktop-test-scroll.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
@@ -31,14 +31,14 @@ jobs:
       - name: "Remove test files workaround"
         run: find packages/desktop/src -name '*.test.*' -delete && find packages/backend/src -name '*.test.*' -delete
 
-      - uses: cypress-io/github-action@v2
+      - uses: cypress-io/github-action@v6
         with:
           install: false
           command: npm run regression-test:ci
           working-directory: packages/desktop
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: test-screenshots-linux
diff --git a/.github/workflows/desktop-tests.yml b/.github/workflows/desktop-tests.yml
index e5b21cfe10..bba3708c19 100644
--- a/.github/workflows/desktop-tests.yml
+++ b/.github/workflows/desktop-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml
index adca0030d3..3e957e1fe7 100644
--- a/.github/workflows/e2e-linux.yml
+++ b/.github/workflows/e2e-linux.yml
@@ -18,7 +18,7 @@ jobs:
       TEST_MODE: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install WM
         run: sudo apt install fluxbox
@@ -53,12 +53,12 @@ jobs:
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@v2
diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
index 0bf9718477..52154c22dd 100644
--- a/.github/workflows/e2e-mac.yml
+++ b/.github/workflows/e2e-mac.yml
@@ -11,7 +11,7 @@ jobs:
       IS_E2E: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -61,11 +61,11 @@ jobs:
           max_attempts: 3
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 25
           max_attempts: 3
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
 
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index 9f06c84c28..490ae7d32a 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -13,7 +13,7 @@ jobs:
       E2E: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
@@ -41,7 +41,7 @@ jobs:
 
       - name: Extract version
         id: extract_version
-        uses: Saionaro/extract-package-version@v1.1.1
+        uses: Saionaro/extract-package-version@v1.2.1
         with:
           path: packages/desktop
 
@@ -56,7 +56,7 @@ jobs:
         shell: bash
 
       - name: "Upload built app"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: quiet-windows
           path: ./packages/desktop/dist/Quiet Setup ${{ steps.extract_version.outputs.version }}.exe
@@ -68,11 +68,11 @@ jobs:
         shell: powershell
 
       - name: Kill Quiet
-        run: Stop-Process -Name "Quiet" -Force
+        run: Get-Process -Name "Quiet" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Kill tor
-        run: Stop-Process -Name "tor" -Force
+        run: Get-Process -Name "tor" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Delay
@@ -87,13 +87,13 @@ jobs:
           shell: bash
           command: cd packages/e2e-tests && npm run test oneClient.test.ts
 
-      - name: Run two clients test
+      - name: Run multiple clients test
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 30
           max_attempts: 3
           shell: bash
-          command: cd packages/e2e-tests && npm run test twoClients.test.ts
+          command: cd packages/e2e-tests && npm run test multipleClients.test.ts
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@v2
diff --git a/.github/workflows/identity-tests.yml b/.github/workflows/identity-tests.yml
index 6a83d07a21..033308b099 100644
--- a/.github/workflows/identity-tests.yml
+++ b/.github/workflows/identity-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 48bc41d289..18680ddb4f 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -20,7 +20,7 @@ jobs:
       - name: 'Print OS'
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
index dd8cbd5878..7326b8ac49 100644
--- a/.github/workflows/mobile-deploy-android.yaml
+++ b/.github/workflows/mobile-deploy-android.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Set up JDK"
         uses: actions/setup-java@v3
@@ -65,7 +65,7 @@ jobs:
 
       - name: "Upload Artifact"
         continue-on-error: true
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app-standard-release.aab
           path: ./packages/mobile/android/app/build/outputs/bundle/standardRelease/app-standard-release.aab
diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
index e86ae241dc..98bd9caee7 100644
--- a/.github/workflows/mobile-deploy-ios.yml
+++ b/.github/workflows/mobile-deploy-ios.yml
@@ -19,7 +19,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           lfs: true
 
@@ -70,7 +70,7 @@ jobs:
             -exportPath build/
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Quiet.ipa
           path: ./packages/mobile/ios/build/Quiet.ipa
diff --git a/.github/workflows/mobile-tests.yml b/.github/workflows/mobile-tests.yml
index ad9e047059..46f8ba291c 100644
--- a/.github/workflows/mobile-tests.yml
+++ b/.github/workflows/mobile-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         uses: ./.github/actions/setup-env
diff --git a/.github/workflows/state-manager-tests.yml b/.github/workflows/state-manager-tests.yml
index 389f2746e6..2ecad2b0b1 100644
--- a/.github/workflows/state-manager-tests.yml
+++ b/.github/workflows/state-manager-tests.yml
@@ -18,7 +18,7 @@ jobs:
       - name: "Print OS"
         run: echo ${{ matrix.os }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup environment"
         uses: ./.github/actions/setup-env
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5be4da8d35..f8e3014843 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,37 @@
-[quiet@2.0.0-alpha.10]
+
+[2.0.1-alpha.2]
+
+* UI layer for taken usernames for desktop and mobile
+
+* Change nickname for taken username
+
+* Map messages sent before changing username
+
+* Update registrar service to match new registration flow.
+
+* Add possible impersonation attack UI for desktop and mobile
+
+* Fix truncated long messages in channelInput component
+
+* Unblock mobile e2e tests
+
+* Prettify loading component on Chat screen (mobile)
+
+* Running Chromatic tests for forked PRs
+
+* Added e2e test for user joining community when owner is offline. Improved e2e tests
+
+* Bump github actions/* to versions using node16
+
+* Project can now be bootstraped on Windows (powershell)
+
+* Placeholder(...) for community name
+
+* No unregistered/duplicated label for system messages
+
+[2.0.0-alpha.11]
+
+* Customize Launch Screen on iOS
 
 * Suspends certain websocket events until backend becomes fully operative (faster and dumber frontend).
 
diff --git a/lerna.json b/lerna.json
index 8a24301f53..aca35a8710 100644
--- a/lerna.json
+++ b/lerna.json
@@ -5,7 +5,7 @@
   "version": "independent",
   "command": {
     "version": {
-      "allowBranch": ["master", "develop", "mobile/releasable"],
+      "allowBranch": ["master", "develop"],
       "conventionalCommits": true,
       "createRelease": "github"
     },
diff --git a/packages/backend-bundle/CHANGELOG.md b/packages/backend-bundle/CHANGELOG.md
index 87d88e889b..4291ace9ec 100644
--- a/packages/backend-bundle/CHANGELOG.md
+++ b/packages/backend-bundle/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.6.1...backend-bundle@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/backend-bundle@2.0.1-alpha.0...backend-bundle@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/backend-bundle@1.7.0-alpha.0...backend-bundle@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/backend-bundle@1.6.1...backend-bundle@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package backend-bundle
diff --git a/packages/backend-bundle/package-lock.json b/packages/backend-bundle/package-lock.json
index d7cafddce4..fc0f6ab4ee 100644
--- a/packages/backend-bundle/package-lock.json
+++ b/packages/backend-bundle/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "backend-bundle",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC"
     }
   }
diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json
index c05b9449de..60f847aa8a 100644
--- a/packages/backend-bundle/package.json
+++ b/packages/backend-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "",
   "main": "bundle.cjs",
   "scripts": {},
diff --git a/packages/backend/.gitattributes b/packages/backend/.gitattributes
new file mode 100644
index 0000000000..2271e38305
--- /dev/null
+++ b/packages/backend/.gitattributes
@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have CRLF line endings on checkout.
+electron-fetch-git.patch text eol=crlf
\ No newline at end of file
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 0ed5fe4960..0e5a476501 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.4...@quiet/backend@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.0...@quiet/backend@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.5...@quiet/backend@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
 # [2.0.0-alpha.20](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.19...@quiet/backend@2.0.0-alpha.20) (2023-10-09)
 
 **Note:** Version bump only for package @quiet/backend
@@ -74,7 +98,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-
 # [1.10.0-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.0...@quiet/backend@1.10.0-alpha.0) (2023-08-29)
 
 **Note:** Version bump only for package @quiet/backend
diff --git a/packages/backend/electron-fetch-git.patch b/packages/backend/electron-fetch-git.patch
new file mode 100644
index 0000000000..68534bfed9
--- /dev/null
+++ b/packages/backend/electron-fetch-git.patch
@@ -0,0 +1,18 @@
+diff --git a/packages/backend/node_modules/electron-fetch/lib/index.js b/packages/backend/node_modules/electron-fetch/lib/index.js
+index c9ea590d9..74c0757a8 100644
+--- a/packages/backend/node_modules/electron-fetch/lib/index.js
++++ b/packages/backend/node_modules/electron-fetch/lib/index.js
+@@ -1283,12 +1283,7 @@ function getNodeRequestOptions(request) {
+ 
+ let electron; // istanbul ignore else
+ 
+-if (process.versions.electron) {
+-  electron = require('electron');
+-}
+-  
+-const isReady = electron && electron.app && !electron.app.isReady() ? new Promise(resolve => electron.app.once('ready', resolve)) : Promise.resolve();
+-
++const isReady = Promise.resolve();
+ /**
+  * Fetch function
+  *
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index f31f587e56..ae6e0430d6 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "2.0.0-alpha.20",
+      "version": "2.0.1-alpha.2",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
@@ -79,6 +79,7 @@
         "fetch-mock-jest": "^1.5.1",
         "jest": "^29.4.2",
         "mock-fs": "^5.1.2",
+        "run-script-os": "1.1.6",
         "tmp": "^0.2.1",
         "ts-jest": "^29.0.3",
         "ts-loader": "9.4.2",
@@ -20049,6 +20050,16 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true,
+      "bin": {
+        "run-os": "index.js",
+        "run-script-os": "index.js"
+      }
+    },
     "node_modules/rxjs": {
       "version": "7.8.1",
       "license": "Apache-2.0",
@@ -35445,6 +35456,12 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true
+    },
     "rxjs": {
       "version": "7.8.1",
       "requires": {
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 91c069b28f..294568124b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.0-alpha.20",
+	"version": "2.0.1-alpha.2",
 	"description": "tlg-manager",
 	"types": "lib/index.d.ts",
 	"type": "module",
@@ -10,14 +10,18 @@
 	"private": true,
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json",
-		"webpack": "webpack --env mode=development && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
+		"webpack": "run-script-os",
+		"webpack:default": "webpack --env mode=development && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
 		"webpack:prod": "webpack --env mode=production && cp ./lib/bundle.cjs ../backend-bundle/bundle.cjs",
-		"applyPatches": "patch -f -p0 < ./electron-fetch.patch || true && patch -f -p0 --forward --binary < ./parse-duration.patch || true && patch -f -p0 --forward --binary < ./parse-duration-esm.patch || true",
+		"webpack:windows": "webpack --env mode=development && xcopy .\\lib\\bundle.cjs ..\\backend-bundle\\ /Y",
+		"webpack:prod:windows": "webpack --env mode=production && xcopy .\\lib\\bundle.cjs ..\\backend-bundle\\ /Y",
+		"applyPatches": "run-script-os",
+		"applyPatches:default": "patch -f -p0 < ./electron-fetch.patch || true && patch -f -p0 --forward --binary < ./parse-duration.patch || true && patch -f -p0 --forward --binary < ./parse-duration-esm.patch || true",
+		"applyPatches:windows": "git apply ./electron-fetch-git.patch --whitespace=fix --reject --verbose --no-index --ignore-space-change --inaccurate-eof || cd .",
 		"prepare": "npm run applyPatches && npm run webpack",
 		"version": "git add -A src",
 		"lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix",
 		"lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/",
-		"test2": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js",
 		"test-nest": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js --detectOpenHandles --forceExit   ./src/nest/**/*.spec.ts",
 		"test": "cross-env NODE_OPTIONS=--experimental-vm-modules DEBUG=ipfs:*,backend:* node_modules/jest/bin/jest.js ./src/**/* --runInBand --verbose --testPathIgnorePatterns=\".src/(!?nodeTest*)|(.node_modules*)\"",
 		"test-ci": "cross-env NODE_OPTIONS=--experimental-vm-modules jest ./src/**/* --runInBand --colors --ci --silent --verbose --testPathIgnorePatterns=\".src/nest/(!?nodeTest*)|(.node_modules*)|src/nest/.*\\.tor.spec\\.(t|j)s|src/nest/ipfs-file-manager/big-files.long.spec.ts$\"",
@@ -54,8 +58,8 @@
 		"@nestjs/cli": "^10.0.0",
 		"@nestjs/schematics": "^10.0.0",
 		"@nestjs/testing": "^10.0.0",
-		"@quiet/eslint-config": "^2.0.0-alpha.18",
-		"@quiet/state-manager": "^2.0.0-alpha.18",
+		"@quiet/eslint-config": "^2.0.1-alpha.2",
+		"@quiet/state-manager": "^2.0.1-alpha.2",
 		"@types/crypto-js": "^4.0.2",
 		"@types/express": "^4.17.9",
 		"@types/jest": "28.1.8",
@@ -73,6 +77,7 @@
 		"fetch-mock-jest": "^1.5.1",
 		"jest": "^29.4.2",
 		"mock-fs": "^5.1.2",
+		"run-script-os": "1.1.6",
 		"tmp": "^0.2.1",
 		"ts-jest": "^29.0.3",
 		"ts-loader": "9.4.2",
@@ -90,10 +95,10 @@
 		"@nestjs/core": "^10.0.0",
 		"@nestjs/platform-express": "^10.0.0",
 		"@peculiar/webcrypto": "1.4.3",
-		"@quiet/common": "^2.0.0-alpha.18",
-		"@quiet/identity": "^2.0.0-alpha.18",
-		"@quiet/logger": "^2.0.0-alpha.18",
-		"@quiet/types": "^2.0.0-alpha.18",
+		"@quiet/common": "^2.0.1-alpha.2",
+		"@quiet/identity": "^2.0.1-alpha.2",
+		"@quiet/logger": "^2.0.1-alpha.2",
+		"@quiet/types": "^2.0.1-alpha.2",
 		"abortable-iterator": "^3.0.0",
 		"class-transformer": "^0.5.1",
 		"class-validator": "^0.13.1",
diff --git a/packages/backend/src/backendManager.ts b/packages/backend/src/backendManager.ts
index 9f3e9e21c6..f7e80b5e4e 100644
--- a/packages/backend/src/backendManager.ts
+++ b/packages/backend/src/backendManager.ts
@@ -72,7 +72,7 @@ export const runBackendDesktop = async () => {
       try {
         await connectionsManager.closeAllServices()
       } catch (e) {
-        log.error('Error occured while closing backend services', e)
+        log.error('Error occurred while closing backend services', e)
       }
       if (process.send) process.send('closed-services')
     }
@@ -80,7 +80,7 @@ export const runBackendDesktop = async () => {
       try {
         await connectionsManager.leaveCommunity()
       } catch (e) {
-        log.error('Error occured while leaving community', e)
+        log.error('Error occurred while leaving community', e)
       }
       if (process.send) process.send('leftCommunity')
     }
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts
index abc3ad923e..4952b669a6 100644
--- a/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts
+++ b/packages/backend/src/nest/connections-manager/connections-manager.service.spec.ts
@@ -2,7 +2,7 @@ import { jest } from '@jest/globals'
 import { LazyModuleLoader } from '@nestjs/core'
 import { Test, TestingModule } from '@nestjs/testing'
 import { getFactory, prepareStore, type Store, type communities, type identity } from '@quiet/state-manager'
-import { type Community, type Identity, type InitCommunityPayload, type LaunchRegistrarPayload } from '@quiet/types'
+import { type Community, type Identity, type InitCommunityPayload } from '@quiet/types'
 import { type FactoryGirl } from 'factory-girl'
 import PeerId from 'peer-id'
 import { TestModule } from '../common/test.module'
@@ -108,10 +108,8 @@ describe('ConnectionsManagerService', () => {
     await connectionsManagerService.closeAllServices()
 
     const launchCommunitySpy = jest.spyOn(connectionsManagerService, 'launchCommunity').mockResolvedValue()
-    const launchRegistrarSpy = jest.spyOn(registrationService, 'launchRegistrar').mockResolvedValue()
 
     await connectionsManagerService.init()
-    expect(launchRegistrarSpy).not.toHaveBeenCalled()
     expect(launchCommunitySpy).toHaveBeenCalledWith(launchCommunityPayload)
   })
 
diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
index d3ca9704aa..c733bb55c1 100644
--- a/packages/backend/src/nest/connections-manager/connections-manager.service.ts
+++ b/packages/backend/src/nest/connections-manager/connections-manager.service.ts
@@ -30,11 +30,8 @@ import {
   NetworkStats,
   PushNotificationPayload,
   RegisterOwnerCertificatePayload,
-  RegisterUserCertificatePayload,
   RemoveDownloadStatus,
   ResponseCreateNetworkPayload,
-  SaveCertificatePayload,
-  SaveOwnerCertificatePayload,
   SendCertificatesResponse,
   SendMessagePayload,
   SetChannelSubscribedPayload,
@@ -43,7 +40,6 @@ import {
   UploadFilePayload,
   PeerId as PeerIdType,
   SaveCSRPayload,
-  SendUserCertificatePayload,
   CommunityMetadata,
   CommunityMetadataPayload,
 } from '@quiet/types'
@@ -178,10 +174,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     if (this.tor && !options.saveTor) {
       await this.tor.kill()
     }
-    if (this.registrationService) {
-      this.logger('Stopping registration service')
-      await this.registrationService.stop()
-    }
     if (this.storageService) {
       this.logger('Stopping orbitdb')
       await this.storageService?.stopOrbitDb()
@@ -362,7 +354,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       targetPort: this.ports.libp2pHiddenService,
       peers,
     }
-    this.logger('libp2p params', params)
 
     await this.libp2pService.createInstance(params)
     // KACPER
@@ -396,26 +387,11 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     this.socketService.on(SocketActionTypes.CONNECTION_PROCESS_INFO, data => {
       this.serverIoProvider.io.emit(SocketActionTypes.CONNECTION_PROCESS_INFO, data)
     })
-
-    this.registrationService.on(SocketActionTypes.CONNECTION_PROCESS_INFO, data => {
-      this.serverIoProvider.io.emit(SocketActionTypes.CONNECTION_PROCESS_INFO, data)
-    })
   }
   private attachRegistrationListeners() {
-    this.registrationService.on(RegistrationEvents.REGISTRAR_STATE, (payload: ServiceState) => {
-      this.registrarState = payload
-    })
     this.registrationService.on(SocketActionTypes.SAVED_OWNER_CERTIFICATE, payload => {
       this.serverIoProvider.io.emit(SocketActionTypes.SAVED_OWNER_CERTIFICATE, payload)
     })
-    this.registrationService.on(RegistrationEvents.SPAWN_HS_FOR_REGISTRAR, async payload => {
-      const onionAddress = await this.tor.spawnHiddenService({
-        targetPort: payload.port,
-        privKey: payload.privateKey,
-        virtPort: payload.targetPort,
-      })
-      this.registrationService.onionAddress = onionAddress
-    })
     this.registrationService.on(RegistrationEvents.ERROR, payload => {
       emitError(this.serverIoProvider.io, payload)
     })
@@ -529,7 +505,6 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
     })
     this.storageService.on(StorageEvents.LOAD_CERTIFICATES, (payload: SendCertificatesResponse) => {
       this.serverIoProvider.io.emit(SocketActionTypes.RESPONSE_GET_CERTIFICATES, payload)
-      this.registrationService.emit(RegistrationEvents.SET_CERTIFICATES, payload.certificates)
     })
     this.storageService.on(StorageEvents.LOAD_PUBLIC_CHANNELS, (payload: ChannelsReplicatedPayload) => {
       this.serverIoProvider.io.emit(SocketActionTypes.CHANNELS_REPLICATED, payload)
@@ -584,11 +559,14 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
       console.log('emitting deleted channel event back to state manager')
       this.serverIoProvider.io.emit(SocketActionTypes.CHANNEL_DELETION_RESPONSE, payload)
     })
-    this.storageService.on(StorageEvents.REPLICATED_CSR, async (payload: string[]) => {
-      console.log(`On ${StorageEvents.REPLICATED_CSR}`)
-      this.serverIoProvider.io.emit(SocketActionTypes.RESPONSE_GET_CSRS, { csrs: payload })
-      payload.forEach(csr => this.registrationService.emit(RegistrationEvents.REGISTER_USER_CERTIFICATE, csr))
-    })
+    this.storageService.on(
+      StorageEvents.REPLICATED_CSR,
+      async (payload: { csrs: string[]; certificates: string[] }) => {
+        console.log(`On ${StorageEvents.REPLICATED_CSR}`)
+        this.serverIoProvider.io.emit(SocketActionTypes.RESPONSE_GET_CSRS, { csrs: payload.csrs })
+        this.registrationService.emit(RegistrationEvents.REGISTER_USER_CERTIFICATE, payload)
+      }
+    )
     this.storageService.on(StorageEvents.REPLICATED_COMMUNITY_METADATA, (payload: CommunityMetadata) => {
       console.log(`On ${StorageEvents.REPLICATED_COMMUNITY_METADATA}: ${payload}`)
       const communityMetadataPayload: CommunityMetadataPayload = {
diff --git a/packages/backend/src/nest/registration/registration.functions.ts b/packages/backend/src/nest/registration/registration.functions.ts
index 43bde69f62..1363eae65e 100644
--- a/packages/backend/src/nest/registration/registration.functions.ts
+++ b/packages/backend/src/nest/registration/registration.functions.ts
@@ -1,31 +1,12 @@
-import {
-  createUserCert,
-  loadCSR,
-  CertFieldsTypes,
-  getReqFieldValue,
-  keyFromCertificate,
-  parseCertificate,
-  getCertFieldValue,
-} from '@quiet/identity'
+import { createUserCert, keyFromCertificate } from '@quiet/identity'
 import { IsBase64, IsNotEmpty, validate } from 'class-validator'
-import { CertificationRequest } from 'pkijs'
-import { Agent } from 'http'
-import AbortController from 'abort-controller'
-import fetch, { Response } from 'node-fetch'
-import { getUsersAddresses } from '../common/utils'
-import {
-  ErrorCodes,
-  ErrorMessages,
-  ErrorPayload,
-  PermsData,
-  SocketActionTypes,
-  SuccessfullRegistrarionResponse,
-  UserCertificatePayload,
-  UserData,
-} from '@quiet/types'
+import { ErrorPayload, PermsData, SocketActionTypes, SuccessfullRegistrarionResponse } from '@quiet/types'
 import { CsrContainsFields, IsCsr } from './registration.validators'
 import { RegistrationEvents } from './registration.types'
+import { loadCSR, CertFieldsTypes, getCertFieldValue, getReqFieldValue, parseCertificate } from '@quiet/identity'
+import { CertificationRequest } from 'pkijs'
 import Logger from '../common/logger'
+import { load } from 'mock-fs'
 
 const logger = Logger('registration.functions')
 class UserCsrData {
@@ -37,51 +18,8 @@ class UserCsrData {
 }
 
 export interface RegistrarResponse {
-  status: number
-  body: any
-}
-
-// REFACTORING: Move this method to identity package
-export const pubKeyMatch = (cert: string, parsedCsr: CertificationRequest): boolean => {
-  const parsedCertificate = parseCertificate(cert)
-  const pubKey = keyFromCertificate(parsedCertificate)
-  const pubKeyCsr = keyFromCertificate(parsedCsr)
-
-  if (pubKey === pubKeyCsr) {
-    return true
-  }
-  return false
-}
-
-export const registerOwner = async (userCsr: string, permsData: PermsData): Promise<string> => {
-  const userData = new UserCsrData()
-  userData.csr = userCsr
-  const validationErrors = await validate(userData)
-  if (validationErrors.length > 0) {
-    throw new Error(`Validation errors: ${validationErrors}`)
-  }
-  const userCert = await createUserCert(
-    permsData.certificate,
-    permsData.privKey,
-    userCsr,
-    new Date(),
-    new Date(2030, 1, 1)
-  )
-  return userCert.userCertString
-}
-
-const certificateByUsername = (username: string, certificates: string[]): string | null => {
-  /**
-   * Check if given username is already in use
-   */
-  for (const cert of certificates) {
-    const parsedCert = parseCertificate(cert)
-    const certUsername = getCertFieldValue(parsedCert, CertFieldsTypes.nickName)
-    if (certUsername?.localeCompare(username, undefined, { sensitivity: 'base' }) === 0) {
-      return cert
-    }
-  }
-  return null
+  cert: string | null
+  error: any
 }
 
 export interface RegistrationResponse {
@@ -89,194 +27,59 @@ export interface RegistrationResponse {
   data: ErrorPayload | SuccessfullRegistrarionResponse
 }
 
-export const sendCertificateRegistrationRequest = async (
-  serviceAddress: string,
-  userCsr: string,
-  communityId: string,
-  requestTimeout = 120000,
-  socksProxyAgent: Agent
-): Promise<RegistrationResponse> => {
-  const controller = new AbortController()
-  const timeout = setTimeout(() => {
-    controller.abort()
-  }, requestTimeout)
-
-  let options = {
-    method: 'POST',
-    body: JSON.stringify({ data: userCsr }),
-    headers: { 'Content-Type': 'application/json' },
-    signal: controller.signal,
-  }
-
-  options = Object.assign(
-    {
-      agent: socksProxyAgent,
-    },
-    options
-  )
-
-  let response: Response | null = null
+export const extractPendingCsrs = async (payload: { csrs: string[]; certificates: string[] }) => {
+  const certNames = new Set<string>()
+  const pendingNames = new Set<string>()
+  const parsedUniqueCsrs = new Map<string, string>()
+  const pendingCsrs: string[] = []
 
-  try {
-    const start = new Date()
-    response = await fetch(`${serviceAddress}/register`, options)
-    const end = new Date()
-    const fetchTime = (end.getTime() - start.getTime()) / 1000
-    logger(`Fetched ${serviceAddress}, time: ${fetchTime}`)
-  } catch (e) {
-    logger.error(e)
-    return {
-      eventType: RegistrationEvents.ERROR,
-      data: {
-        type: SocketActionTypes.REGISTRAR,
-        code: ErrorCodes.NOT_FOUND,
-        message: ErrorMessages.REGISTRAR_NOT_FOUND,
-        community: communityId,
-      },
+  payload.certificates.forEach(cert => {
+    const parsedCert = parseCertificate(cert)
+    const username = getCertFieldValue(parsedCert, CertFieldsTypes.nickName)
+    if (username) {
+      certNames.add(username)
     }
-  } finally {
-    clearTimeout(timeout)
-  }
+  })
 
-  switch (response?.status) {
-    case 200:
-      break
-    case 400:
-      return {
-        eventType: RegistrationEvents.ERROR,
-        data: {
-          type: SocketActionTypes.REGISTRAR,
-          code: ErrorCodes.BAD_REQUEST,
-          message: ErrorMessages.INVALID_USERNAME,
-          community: communityId,
-        },
-      }
-    case 403:
-      return {
-        eventType: RegistrationEvents.ERROR,
-        data: {
-          type: SocketActionTypes.REGISTRAR,
-          code: ErrorCodes.FORBIDDEN,
-          message: ErrorMessages.USERNAME_TAKEN,
-          community: communityId,
-        },
-      }
-    case 404:
-      return {
-        eventType: RegistrationEvents.ERROR,
-        data: {
-          type: SocketActionTypes.REGISTRAR,
-          code: ErrorCodes.NOT_FOUND,
-          message: ErrorMessages.REGISTRAR_NOT_FOUND,
-          community: communityId,
-        },
-      }
-    default:
-      logger.error(`Registrar responded with ${response?.status} "${response?.statusText}" (${communityId})`)
-      return {
-        eventType: RegistrationEvents.ERROR,
-        data: {
-          type: SocketActionTypes.REGISTRAR,
-          code: ErrorCodes.SERVER_ERROR,
-          message: ErrorMessages.REGISTRATION_FAILED,
-          community: communityId,
-        },
-      }
+  for (const csr of payload.csrs.reverse()) {
+    const parsedCsr = await loadCSR(csr)
+    const pubKey = keyFromCertificate(parsedCsr)
+    if (!parsedUniqueCsrs.has(pubKey)) {
+      parsedUniqueCsrs.set(pubKey, csr)
+    }
   }
 
-  const registrarResponse: UserCertificatePayload = await response.json()
+  const uniqueCsrsArray = Array.from(parsedUniqueCsrs.values()).reverse()
 
-  logger(`Sending user certificate (${communityId})`)
-  return {
-    eventType: SocketActionTypes.SEND_USER_CERTIFICATE,
-    data: {
-      communityId: communityId,
-      payload: registrarResponse,
-    },
+  for (const csr of uniqueCsrsArray) {
+    const parsedCsr = await loadCSR(csr)
+    const username = getReqFieldValue(parsedCsr, CertFieldsTypes.nickName)
+    if (username && !certNames.has(username) && !pendingNames.has(username)) {
+      pendingNames.add(username)
+      pendingCsrs.push(csr)
+    }
   }
+  return pendingCsrs
 }
 
-export const registerUser = async (
-  csr: string,
-  permsData: PermsData,
-  certificates: string[],
-  ownerCertificate: string
-): Promise<RegistrarResponse> => {
-  let cert: string
+export const validateCsr = async (csr: string) => {
   const userData = new UserCsrData()
   userData.csr = csr
   const validationErrors = await validate(userData)
-  if (validationErrors.length > 0) {
-    logger.error(`Received data is not valid: ${validationErrors.toString()}`)
-    return {
-      status: 400,
-      body: JSON.stringify(validationErrors),
-    }
-  }
+  return validationErrors
+}
 
-  const parsedCsr = await loadCSR(userData.csr)
-  const username = getReqFieldValue(parsedCsr, CertFieldsTypes.nickName)
-  if (!username) {
-    logger.error(`Could not parse certificate for field type ${CertFieldsTypes.nickName}`)
+/**
+ * This function should only be called with pending CSRs (by calling extractPendingCsrs first which prevents signing CSRs for duplicate usernames).
+ */
+export const issueCertificate = async (userCsr: string, permsData: PermsData): Promise<RegistrarResponse> => {
+  const validationErrors = await validateCsr(userCsr)
+  if (validationErrors.length > 0) {
     return {
-      // Should be internal server error code 500
-      status: 400,
-      body: null,
-    }
-  }
-  // Use map here
-  const usernameCert = certificateByUsername(username, certificates)
-  if (usernameCert) {
-    if (!pubKeyMatch(usernameCert, parsedCsr)) {
-      logger(`Username ${username} is taken`)
-      return {
-        // Should be conflict code 409
-        status: 403,
-        body: null,
-      }
-    } else {
-      logger('Requesting same CSR again')
-      cert = usernameCert
-    }
-  } else {
-    logger('username doesnt have existing cert, creating new')
-    try {
-      cert = await registerCertificate(userData.csr, permsData)
-    } catch (e) {
-      logger.error(`Something went wrong with registering user: ${e.message as string}`)
-      return {
-        // Should be internal server error code 500
-        status: 400,
-        body: null,
-      }
+      cert: null,
+      error: [validationErrors],
     }
   }
-
-  const allUsers: UserData[] = []
-  for (const cert of certificates) {
-    const parsedCert = parseCertificate(cert)
-    const onionAddress = getCertFieldValue(parsedCert, CertFieldsTypes.commonName)
-    const peerId = getCertFieldValue(parsedCert, CertFieldsTypes.peerId)
-    const username = getCertFieldValue(parsedCert, CertFieldsTypes.nickName)
-    const dmPublicKey = getCertFieldValue(parsedCert, CertFieldsTypes.dmPublicKey)
-    if (!onionAddress || !peerId || !username || !dmPublicKey) continue
-    allUsers.push({ onionAddress, peerId, username, dmPublicKey })
-  }
-
-  const peerList = await getUsersAddresses(allUsers)
-
-  return {
-    status: 200,
-    body: {
-      certificate: cert,
-      peers: peerList,
-      rootCa: permsData.certificate,
-      ownerCert: ownerCertificate,
-    },
-  }
-}
-
-export const registerCertificate = async (userCsr: string, permsData: PermsData): Promise<string> => {
   const userCert = await createUserCert(
     permsData.certificate,
     permsData.privKey,
@@ -284,5 +87,8 @@ export const registerCertificate = async (userCsr: string, permsData: PermsData)
     new Date(),
     new Date(2030, 1, 1)
   )
-  return userCert.userCertString
+  return {
+    cert: userCert.userCertString,
+    error: null,
+  }
 }
diff --git a/packages/backend/src/nest/registration/registration.service.spec.ts b/packages/backend/src/nest/registration/registration.service.spec.ts
index 38719e3ec0..6355013592 100644
--- a/packages/backend/src/nest/registration/registration.service.spec.ts
+++ b/packages/backend/src/nest/registration/registration.service.spec.ts
@@ -2,29 +2,14 @@ import { Test, TestingModule } from '@nestjs/testing'
 import { TestModule } from '../common/test.module'
 import { RegistrationModule } from './registration.module'
 import { RegistrationService } from './registration.service'
-import {
-  configCrypto,
-  createRootCA,
-  createUserCert,
-  createUserCsr,
-  type RootCA,
-  verifyUserCert,
-  type UserCsr,
-} from '@quiet/identity'
+import { configCrypto, createRootCA, createUserCsr, type RootCA, verifyUserCert, type UserCsr } from '@quiet/identity'
 import { type DirResult } from 'tmp'
-import { ErrorCodes, ErrorMessages, type PermsData, SocketActionTypes } from '@quiet/types'
+import { type PermsData } from '@quiet/types'
 import { Time } from 'pkijs'
-import { registerOwner, registerUser, sendCertificateRegistrationRequest } from './registration.functions'
-import createHttpsProxyAgent from 'https-proxy-agent'
-import { RegistrationEvents } from './registration.types'
+import { issueCertificate, extractPendingCsrs } from './registration.functions'
 import { jest } from '@jest/globals'
 import { createTmpDir } from '../common/utils'
 
-// @ts-ignore
-const { Response } = jest.requireActual('node-fetch')
-
-jest.mock('node-fetch', () => jest.fn())
-
 describe('RegistrationService', () => {
   let module: TestingModule
   let registrationService: RegistrationService
@@ -34,7 +19,6 @@ describe('RegistrationService', () => {
   let permsData: PermsData
   let userCsr: UserCsr
   let invalidUserCsr: any
-  let fetch: any
 
   beforeEach(async () => {
     module = await Test.createTestingModule({
@@ -60,7 +44,6 @@ describe('RegistrationService', () => {
       hashAlg: configCrypto.hashAlg,
     })
     invalidUserCsr = 'invalidUserCsr'
-    fetch = await import('node-fetch')
   })
 
   afterEach(async () => {
@@ -68,104 +51,99 @@ describe('RegistrationService', () => {
     await module.close()
   })
 
-  it('registerOwner should return certificate if csr is valid', async () => {
-    const result = await registerOwner(userCsr.userCsr, permsData)
-    expect(result).toBeTruthy()
+  it('registerUser should return cert if csr is valid and cert should pass the verification', async () => {
+    const responseData = await issueCertificate(userCsr.userCsr, permsData)
+    expect(responseData.cert).toBeTruthy()
+    if (!responseData.cert) return null
+    const isProperUserCert = await verifyUserCert(certRoot.rootCertString, responseData.cert)
+    expect(isProperUserCert.result).toBe(true)
   })
 
-  it('registerOwner should throw error if csr is invalid', async () => {
-    await expect(registerOwner(invalidUserCsr, permsData)).rejects.toThrow()
+  it('registrar should return errors array if csr is not valid and should not return any cert', async () => {
+    const responseData = await issueCertificate(invalidUserCsr, permsData)
+    expect(responseData.cert).toBeFalsy()
+    expect(responseData.error.length).toBeTruthy()
   })
 
-  it('registerUser should return 200 status code', async () => {
-    const responseData = await registerUser(userCsr.userCsr, permsData, [], 'ownerCert')
-    const isProperUserCert = await verifyUserCert(certRoot.rootCertString, responseData.body.certificate)
-    expect(isProperUserCert.result).toBe(true)
+  it('extractPendingCsrs should return all csrs if there are no certificates and csrs do not contain duplicate usernames', async () => {
+    const certificates: string[] = []
+    const csrs: string[] = [userCsr.userCsr]
+    const payload: { certificates: string[]; csrs: string[] } = {
+      certificates: certificates,
+      csrs: csrs,
+    }
+    const pendingCsrs = await extractPendingCsrs(payload)
+    expect(pendingCsrs).toEqual(csrs)
   })
 
-  it('returns existing certificate if username is taken but csr and cert public keys match', async () => {
-    const user = await createUserCsr({
-      nickname: 'userName',
+  it('extractPendingCsrs should return all csrs if there are certificates, and csrs do not contain any name that is in certificates already', async () => {
+    const aliceCsr = await createUserCsr({
+      nickname: 'alice',
       commonName: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
       peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
-      dmPublicKey: 'testdmPublicKey1',
+      dmPublicKey: 'testdmPublicKey',
       signAlg: configCrypto.signAlg,
       hashAlg: configCrypto.hashAlg,
     })
-    const userCert = await createUserCert(
-      certRoot.rootCertString,
-      certRoot.rootKeyString,
-      user.userCsr,
-      new Date(),
-      new Date(2030, 1, 1)
-    )
-    const responseData = await registerUser(user.userCsr, permsData, [userCert.userCertString], 'ownerCert')
-    expect(responseData.status).toEqual(200)
-    const isProperUserCert = await verifyUserCert(certRoot.rootCertString, responseData.body.certificate)
-    expect(isProperUserCert.result).toBe(true)
-    expect(responseData.body.peers.length).toBe(1)
-    expect(responseData.body.rootCa).toBe(certRoot.rootCertString)
+    const aliceCert = await issueCertificate(aliceCsr.userCsr, permsData)
+    if (!aliceCert.cert) return
+    const certificates: string[] = [aliceCert.cert]
+    const csrs: string[] = [userCsr.userCsr]
+    const payload: { certificates: string[]; csrs: string[] } = {
+      certificates: certificates,
+      csrs: csrs,
+    }
+    const pendingCsrs = await extractPendingCsrs(payload)
+    expect(pendingCsrs).toEqual(csrs)
   })
 
-  it('returns 403 if username already exists and csr and cert public keys dont match', async () => {
-    const user = await createUserCsr({
-      nickname: 'userName',
+  it('extractPendingCsrs should return filtered csrs, excluding those that tries to claim username already present in certificate', async () => {
+    const userCert = await issueCertificate(userCsr.userCsr, permsData)
+    if (!userCert.cert) return
+    const certificates: string[] = [userCert.cert]
+    const csrs: string[] = [userCsr.userCsr]
+    const payload: { certificates: string[]; csrs: string[] } = {
+      certificates: certificates,
+      csrs: csrs,
+    }
+    const pendingCsrs = await extractPendingCsrs(payload)
+    expect(pendingCsrs.length).toEqual(0)
+  })
+
+  it('extractPendingCsrs should return all csrs if there are no duplicates in requested usernames', async () => {
+    const userCsr2 = await createUserCsr({
+      nickname: 'userName2',
       commonName: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
       peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
-      dmPublicKey: 'testdmPublicKey1',
+      dmPublicKey: 'testdmPublicKey',
       signAlg: configCrypto.signAlg,
       hashAlg: configCrypto.hashAlg,
     })
-    const userCert = await createUserCert(
-      certRoot.rootCertString,
-      certRoot.rootKeyString,
-      user.userCsr,
-      new Date(),
-      new Date(2030, 1, 1)
-    )
-    const userNew = await createUserCsr({
-      nickname: 'username',
-      commonName: 'abcd.onion',
-      peerId: 'QmS9vJkgbea9EgzHvVPqhj1u4tH7YKq7eteDN7gnG5zUmc',
-      dmPublicKey: 'testdmPublicKey2',
+    const csrs: string[] = [userCsr.userCsr, userCsr2.userCsr]
+    const pendingCsrs = await extractPendingCsrs({ certificates: [], csrs: csrs })
+    expect(pendingCsrs.length).toEqual(csrs.length)
+  })
+
+  it('Extract pending csrs should return only csrs that have unique usernames', async () => {
+    const userCsr = await createUserCsr({
+      nickname: 'karol',
+      commonName: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
+      peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
+      dmPublicKey: 'testdmPublicKey',
       signAlg: configCrypto.signAlg,
       hashAlg: configCrypto.hashAlg,
     })
-    const response = await registerUser(userNew.userCsr, permsData, [userCert.userCertString], 'ownerCert')
-    expect(response.status).toEqual(403)
-  })
-
-  it('returns 400 if no csr in data or csr has wrong format', async () => {
-    for (const invalidCsr of ['', 'abcd']) {
-      const response = await registerUser(invalidCsr, permsData, [], 'ownerCert')
-      expect(response.status).toEqual(400)
-    }
-  })
-
-  it('returns 400 if csr is lacking a field', async () => {
-    const csr =
-      'MIIBFTCBvAIBADAqMSgwFgYKKwYBBAGDjBsCARMIdGVzdE5hbWUwDgYDVQQDEwdaYmF5IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGPGHpJzE/CvL7l/OmTSfYQrhhnWQrYw3GgWB1raCTSeFI/MDVztkBOlxwdUWSm10+1OtKVUWeMKaMtyIYFcPPqAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFLjaEh+cnNhsi5qDsiMB/ZTzZFfqMAoGCCqGSM49BAMCA0gAMEUCIFwlob/Igab05EozU0e/lsG7c9BxEy4M4c4Jzru2vasGAiEAqFTQuQr/mVqTHO5vybWm/iNDk8vh88K6aBCCGYqIfdw='
-    const response = await registerUser(csr, permsData, [], 'ownerCert')
-    expect(response.status).toEqual(400)
-  })
-
-  it('returns 404 if fetching registrar address throws error', async () => {
-    console.log(fetch)
-    fetch.default.mockRejectedValue('User aborted request')
-    const communityId = 'communityID'
-    const response = await sendCertificateRegistrationRequest(
-      'QmS9vJkgbea9EgzHvVPqhj1u4tH7YKq7eteDN7gnG5zUmc',
-      userCsr.userCsr,
-      communityId,
-      1000,
-      createHttpsProxyAgent({ port: '12311', host: 'localhost' })
-    )
-    expect(response.eventType).toBe(RegistrationEvents.ERROR)
-    expect(response.data).toEqual({
-      type: SocketActionTypes.REGISTRAR,
-      code: ErrorCodes.NOT_FOUND,
-      message: ErrorMessages.REGISTRAR_NOT_FOUND,
-      community: communityId,
+    const userCsr2 = await createUserCsr({
+      nickname: 'karol',
+      commonName: 'nnnnnnc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
+      peerId: 'QmffffffqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
+      dmPublicKey: 'testdmPublicKey',
+      signAlg: configCrypto.signAlg,
+      hashAlg: configCrypto.hashAlg,
     })
+    const csrs: string[] = [userCsr.userCsr, userCsr2.userCsr]
+    const pendingCsrs = await extractPendingCsrs({ certificates: [], csrs: csrs })
+    expect(pendingCsrs.length).toEqual(1)
+    expect(pendingCsrs[0]).toBe(userCsr.userCsr)
   })
 })
diff --git a/packages/backend/src/nest/registration/registration.service.ts b/packages/backend/src/nest/registration/registration.service.ts
index 2640e14cea..c788d1cb7c 100644
--- a/packages/backend/src/nest/registration/registration.service.ts
+++ b/packages/backend/src/nest/registration/registration.service.ts
@@ -1,110 +1,39 @@
-import { Inject, Injectable, OnModuleInit } from '@nestjs/common'
-import express from 'express'
-import getPort from 'get-port'
-import { Agent, Server } from 'http'
+import { Injectable, OnModuleInit } from '@nestjs/common'
 import { EventEmitter } from 'events'
-import {
-  registerOwner,
-  registerUser,
-  RegistrarResponse,
-  RegistrationResponse,
-  sendCertificateRegistrationRequest,
-} from './registration.functions'
-import {
-  ConnectionProcessInfo,
-  ErrorCodes,
-  ErrorMessages,
-  LaunchRegistrarPayload,
-  PermsData,
-  RegisterOwnerCertificatePayload,
-  SocketActionTypes,
-} from '@quiet/types'
-import { EXPRESS_PROVIDER } from '../const'
+import { extractPendingCsrs, issueCertificate } from './registration.functions'
+import { ErrorCodes, ErrorMessages, PermsData, RegisterOwnerCertificatePayload, SocketActionTypes } from '@quiet/types'
 import { RegistrationEvents } from './registration.types'
-import { ServiceState } from '../connections-manager/connections-manager.types'
 import Logger from '../common/logger'
 
 @Injectable()
 export class RegistrationService extends EventEmitter implements OnModuleInit {
   private readonly logger = Logger(RegistrationService.name)
-  public onionAddress: string
-  private _server: Server
-  private _port: number
-  public registrationService: any
   public certificates: string[] = []
   private _permsData: PermsData
-  private _ownerCertificate: string
 
-  constructor(@Inject(EXPRESS_PROVIDER) public readonly _app: express.Application) {
+  constructor() {
     super()
   }
 
   onModuleInit() {
-    this.on(RegistrationEvents.SET_CERTIFICATES, certs => {
-      this.setCertificates(certs)
-    })
-    this.on(RegistrationEvents.REGISTER_USER_CERTIFICATE, async (csr: string) => {
-      if (!this._permsData) {
-        console.log('NO PERMS DATA')
-        return
-      }
-      await this.registerUser(csr)
-    })
-    // eslint-disable-next-line
-    const self = this
-    this.setRouting(self)
-  }
-
-  public setCertificates(certs: string[]) {
-    this.certificates = certs
-  }
-
-  private pendingPromise: Promise<RegistrarResponse> | null = null
-
-  private setRouting(self: any) {
-    // @ts-ignore
-    const middleware = function (req, res, next) {
-      const host = req.headers['host']
-      if (host !== self.onionAddress) {
-        return res.status(403).send('Access denied')
+    this.on(
+      RegistrationEvents.REGISTER_USER_CERTIFICATE,
+      async (payload: { csrs: string[]; certificates: string[] }) => {
+        // Lack of permsData means that we are not the owner of the community in the official model of the app, however anyone can modify the source code, put malicious permsData here, issue false certificates and try to trick other users.
+        await this.issueCertificates(payload)
       }
-      next()
-    }
-
-    this._app.use(middleware)
-    this._app.use(express.json())
-    this._app.post('/register', async (req, res): Promise<void> => {
-      if (this.pendingPromise) return
-      this.pendingPromise = this.registerUser(req.body.data)
-      const result = await this.pendingPromise
-      if (result) {
-        res.status(result.status).send(result.body)
-      }
-      this.pendingPromise = null
-    })
-  }
-
-  public async listen(): Promise<void> {
-    return await new Promise(resolve => {
-      this._server = this._app.listen(this._port, () => {
-        this.logger(`Certificate registration service listening on port: ${this._port}`)
-        resolve()
-      })
-    })
+    )
   }
 
-  public async stop(): Promise<void> {
-    return await new Promise(resolve => {
-      if (!this._server) resolve()
-      this._server.close(() => {
-        this.logger('Certificate registration service closed')
-        resolve()
-      })
+  private async issueCertificates(payload: { csrs: string[]; certificates: string[] }) {
+    if (!this._permsData) return
+    const pendingCsrs = await extractPendingCsrs(payload)
+    pendingCsrs.forEach(async csr => {
+      await this.registerUserCertificate(csr)
     })
   }
 
   public set permsData(perms: PermsData) {
-    console.log('Setting owner perms data')
     this._permsData = {
       certificate: perms.certificate,
       privKey: perms.privKey,
@@ -112,79 +41,28 @@ export class RegistrationService extends EventEmitter implements OnModuleInit {
   }
 
   public async registerOwnerCertificate(payload: RegisterOwnerCertificatePayload): Promise<void> {
-    let cert: string
-    try {
-      cert = await registerOwner(payload.userCsr.userCsr, payload.permsData)
-    } catch (e) {
-      this.logger.error(`Registering owner failed: ${e.message}`)
+    // FIXME: We should resolve problems with events order and we should set permsData only on LAUNCH_REGISTRART socket event in connectionsManager.
+    this._permsData = payload.permsData
+    const result = await issueCertificate(payload.userCsr.userCsr, this._permsData)
+    if (result?.cert) {
+      this.emit(SocketActionTypes.SAVED_OWNER_CERTIFICATE, {
+        communityId: payload.communityId,
+        network: { certificate: result.cert },
+      })
+    } else {
       this.emit(SocketActionTypes.ERROR, {
         type: SocketActionTypes.REGISTRAR,
         code: ErrorCodes.SERVER_ERROR,
         message: ErrorMessages.REGISTRATION_FAILED,
         community: payload.communityId,
       })
-      return
-    }
-    this.emit(SocketActionTypes.SAVED_OWNER_CERTIFICATE, {
-      communityId: payload.communityId,
-      network: { certificate: cert, peers: [] },
-    })
-    this._ownerCertificate = cert
-  }
-
-  public async sendCertificateRegistrationRequest(
-    serviceAddress: string,
-    userCsr: string,
-    communityId: string,
-    requestTimeout = 120000,
-    socksProxyAgent: Agent
-  ): Promise<void> {
-    const response: RegistrationResponse = await sendCertificateRegistrationRequest(
-      serviceAddress,
-      userCsr,
-      communityId,
-      requestTimeout,
-      socksProxyAgent
-    )
-    this.emit(SocketActionTypes.CONNECTION_PROCESS_INFO, ConnectionProcessInfo.CONNECTING_TO_COMMUNITY)
-    this.emit(response.eventType, response.data)
-  }
-
-  public async registerUser(csr: string): Promise<{ status: number; body: any }> {
-    const result = await registerUser(csr, this._permsData, this.certificates, this._ownerCertificate)
-    if (result?.status === 200) {
-      this.emit(RegistrationEvents.NEW_USER, { certificate: result.body.certificate, rootPermsData: this._permsData })
     }
-    return result
   }
 
-  public async launchRegistrar(payload: LaunchRegistrarPayload): Promise<void> {
-    this.emit(RegistrationEvents.REGISTRAR_STATE, ServiceState.LAUNCHING)
-    this._permsData = {
-      certificate: payload.rootCertString,
-      privKey: payload.rootKeyString,
-    }
-    this.logger(`Initializing registration service for peer ${payload.peerId}...`)
-    try {
-      await this.init(payload.privateKey)
-    } catch (err) {
-      this.logger.error(`Couldn't initialize certificate registration service: ${err as string}`)
-      return
+  public async registerUserCertificate(csr: string): Promise<void> {
+    const result = await issueCertificate(csr, this._permsData)
+    if (result?.cert) {
+      this.emit(RegistrationEvents.NEW_USER, { certificate: result.cert })
     }
-    try {
-      await this.listen()
-    } catch (err) {
-      this.logger.error(`Certificate registration service couldn't start listening: ${err as string}`)
-    }
-    this.emit(RegistrationEvents.REGISTRAR_STATE, ServiceState.LAUNCHED)
-  }
-
-  public async init(privKey: string): Promise<void> {
-    this._port = await getPort()
-    this.emit(RegistrationEvents.SPAWN_HS_FOR_REGISTRAR, {
-      port: this._port,
-      privateKey: privKey,
-      targetPort: 80,
-    })
   }
 }
diff --git a/packages/backend/src/nest/registration/registration.types.ts b/packages/backend/src/nest/registration/registration.types.ts
index dcffe9d7f9..02da49c0d6 100644
--- a/packages/backend/src/nest/registration/registration.types.ts
+++ b/packages/backend/src/nest/registration/registration.types.ts
@@ -1,8 +1,5 @@
 export enum RegistrationEvents {
   ERROR = 'error',
-  SPAWN_HS_FOR_REGISTRAR = 'spawnHsForRegistrar',
   NEW_USER = 'newUser',
-  SET_CERTIFICATES = 'setCertificates',
-  REGISTRAR_STATE = 'registrarState',
   REGISTER_USER_CERTIFICATE = 'registerUserCertificate',
 }
diff --git a/packages/backend/src/nest/socket/socket.service.ts b/packages/backend/src/nest/socket/socket.service.ts
index 073636a08b..5d687fe2a2 100644
--- a/packages/backend/src/nest/socket/socket.service.ts
+++ b/packages/backend/src/nest/socket/socket.service.ts
@@ -174,9 +174,6 @@ export class SocketService extends EventEmitter implements OnModuleInit {
           ownerCertificate: payload.certificate,
           rootCa: payload.permsData.certificate,
         }
-
-        console.log('Metadata from state-manager', communityMetadataPayload)
-
         this.emit(SocketActionTypes.SEND_COMMUNITY_METADATA, communityMetadataPayload)
       })
 
diff --git a/packages/backend/src/nest/storage/storage.service.spec.ts b/packages/backend/src/nest/storage/storage.service.spec.ts
index 9012cf0785..a4e0fb0ada 100644
--- a/packages/backend/src/nest/storage/storage.service.spec.ts
+++ b/packages/backend/src/nest/storage/storage.service.spec.ts
@@ -295,26 +295,6 @@ describe('StorageService', () => {
       expect(result).toBe(true)
     })
 
-    it('is not saved to db if did not pass verification', async () => {
-      const oldUserCertificate = await createUserCert(
-        rootPermsData.certificate,
-        rootPermsData.privKey,
-        // @ts-expect-error userCsr can be undefined
-        alice.userCsr?.userCsr,
-        new Date(2021, 1, 1),
-        new Date(2021, 1, 2)
-      )
-
-      await storageService.init(peerId)
-
-      const result = await storageService.saveCertificate({
-        certificate: oldUserCertificate.userCertString,
-        rootPermsData,
-      })
-
-      expect(result).toBe(false)
-    })
-
     it('is not saved to db if empty', async () => {
       await storageService.init(peerId)
 
diff --git a/packages/backend/src/nest/storage/storage.service.ts b/packages/backend/src/nest/storage/storage.service.ts
index dbe0a8622b..62f1d6ba88 100644
--- a/packages/backend/src/nest/storage/storage.service.ts
+++ b/packages/backend/src/nest/storage/storage.service.ts
@@ -397,36 +397,18 @@ export class StorageService extends EventEmitter {
         write: ['*'],
       },
     })
-    this.certificatesRequests.events.on('replicate.progress', async (_address, _hash, entry, _progress, _total) => {
-      const csr: string = entry.payload.value
-      this.logger('Replicated csr')
-      let parsedCSR: CertificationRequest
-      try {
-        parsedCSR = parseCertificationRequest(csr)
-      } catch (e) {
-        this.logger.error(`csrs replicate.progress: could not parse certificate request`)
-        return
-      }
-
-      const username = getReqFieldValue(parsedCSR, CertFieldsTypes.nickName)
-      if (!username) {
-        this.logger.error(
-          `csrs replicate.progress: could not parse certificate request for field type ${CertFieldsTypes.nickName}`
-        )
-        return
-      }
-      this.emit(StorageEvents.REPLICATED_CSR, [csr])
-    })
     this.certificatesRequests.events.on('replicated', async () => {
       this.logger('REPLICATED: CSRs')
       const allCsrs = this.getAllEventLogEntries(this.certificatesRequests)
-      this.emit(StorageEvents.REPLICATED_CSR, allCsrs)
+      const allCertificates = this.getAllEventLogEntries(this.certificates)
+      this.emit(StorageEvents.REPLICATED_CSR, { csrs: allCsrs, certificates: allCertificates })
       await this.updatePeersList()
     })
     this.certificatesRequests.events.on('write', async (_address, entry) => {
       const csr: string = entry.payload.value
       this.logger('Saved CSR locally')
-      this.emit(StorageEvents.REPLICATED_CSR, [csr])
+      const allCertificates = this.getAllEventLogEntries(this.certificates)
+      this.emit(StorageEvents.REPLICATED_CSR, { csrs: [csr], certificates: allCertificates })
       await this.updatePeersList()
     })
 
@@ -849,12 +831,6 @@ export class StorageService extends EventEmitter {
       this.logger('Certificate is either null or undefined, not saving to db')
       return false
     }
-    const verification = await verifyUserCert(payload.rootPermsData.certificate, payload.certificate)
-    if (verification.resultCode !== 0) {
-      this.logger.error('Certificate is not valid')
-      this.logger.error(verification.resultMessage)
-      return false
-    }
     this.logger('Saving certificate...')
     await this.certificates.add(payload.certificate)
     return true
diff --git a/packages/backend/src/nest/websocketOverTor/websocketOverTor.tor.spec.ts b/packages/backend/src/nest/websocketOverTor/websocketOverTor.tor.spec.ts
index 1ffde5daa4..f8fc150f63 100644
--- a/packages/backend/src/nest/websocketOverTor/websocketOverTor.tor.spec.ts
+++ b/packages/backend/src/nest/websocketOverTor/websocketOverTor.tor.spec.ts
@@ -118,7 +118,8 @@ describe('websocketOverTor', () => {
     await listener?.close()
   })
 
-  it.each([
+  // Those are randomly failing and we do not use wss atm anyway.
+  it.skip.each([
     ['string', String],
     ['array', Array],
   ])('connects successfully with CA passed as %s', async (_name: string, caType: (ca: string) => any) => {
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index 927083dec1..dddc4388af 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.1...@quiet/common@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/common@2.0.1-alpha.0...@quiet/common@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@2.0.0-alpha.3...@quiet/common@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/common@2.0.0-alpha.3...@quiet/common@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/common
diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
index 998dc70725..1c7d1069b5 100644
--- a/packages/common/package-lock.json
+++ b/packages/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/common",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/common/package.json b/packages/common/package.json
index 309fa44c15..ac7b81004b 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "Common monorepo utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
     "jest": "^26.6.3",
@@ -26,7 +26,7 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/types": "^2.0.0-alpha.18",
+    "@quiet/types": "^2.0.1-alpha.2",
     "cross-env": "^5.2.0",
     "debug": "^4.3.1"
   },
diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
index c63622b9fe..9df9924507 100644
--- a/packages/desktop/CHANGELOG.md
+++ b/packages/desktop/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# 2.0.0-alpha.18 (2023-10-04)
+## 2.0.1-alpha.2 (2023-10-09)
 
 
 ### Bug Fixes
@@ -19,6 +19,38 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/quiet@2.0.1-alpha.0...quiet@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package quiet
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/quiet@2.0.0-alpha.12...quiet@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package quiet
+
+
+
+
+
+# [2.0.0-alpha.12](https://github.com/TryQuiet/quiet/compare/quiet@2.0.0-alpha.11...quiet@2.0.0-alpha.12) (2023-09-20)
+
+**Note:** Version bump only for package quiet
+
+
+
+
+
+# [2.0.0-alpha.11](https://github.com/TryQuiet/quiet/compare/quiet@2.0.0-alpha.10...quiet@2.0.0-alpha.11) (2023-09-19)
+
+**Note:** Version bump only for package quiet
+
+
+
+
+
 # [2.0.0-alpha.10](https://github.com/TryQuiet/quiet/compare/quiet@2.0.0-alpha.9...quiet@2.0.0-alpha.10) (2023-09-19)
 
 **Note:** Version bump only for package quiet
diff --git a/packages/desktop/README.md b/packages/desktop/README.md
index c58c4b3d5c..ca80365377 100644
--- a/packages/desktop/README.md
+++ b/packages/desktop/README.md
@@ -20,6 +20,20 @@ npm run start
 ```
 ----
 
+## Running dev desktop on Windows
+
+Bootstrap scripts has been adjusted to work on Windows (powershell or cmd) hovewer there still may be a problem with patching.
+Getting error:
+
+```
+webpack://@quiet/backend/./node_modules/electron/index.js?:9
+  throw new Error('Electron failed to install correctly, please delete node_modules/electron and try installing again')
+```
+
+while running desktop may mean that applying patch in packages/backend (`npm run applyPatches`) did not work correctly.
+If that's the case file must be patched manually according to `electron-fetch-git.patch` and backend must be rebuilt by running  `npm run webpack` in packages/backend.
+
+
 ## Versioning packages
 
 Before trying to release a new version, make sure you have `GH_TOKEN` env set.
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index f4445149aa..12370c6f59 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/desktop",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/desktop",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
@@ -134,6 +134,7 @@
         "redux-saga-test-plan": "^4.0.3",
         "redux-thunk": "^2.3.0",
         "reselect": "^4.1.5",
+        "run-script-os": "1.1.6",
         "socket.io-mock": "^1.3.2",
         "source-map-loader": "^4.0.1",
         "standard": "^12.0.1",
@@ -40258,6 +40259,16 @@
         "aproba": "^1.1.1"
       }
     },
+    "node_modules/run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true,
+      "bin": {
+        "run-os": "index.js",
+        "run-script-os": "index.js"
+      }
+    },
     "node_modules/rxjs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
@@ -76824,6 +76835,12 @@
         "aproba": "^1.1.1"
       }
     },
+    "run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true
+    },
     "rxjs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index ef1982c0ac..57d050383c 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -80,7 +80,7 @@
   },
   "homepage": "https://github.com/TryQuiet",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -120,16 +120,18 @@
     "rmDist": "rimraf dist/",
     "setMainEnvs": "node scripts/setMainEnvs.js",
     "copyMainEnvs": "cp mainEnvs.json dist/main",
-    "copyFonts": "cp src/renderer/fonts/* dist/main"
+    "copyFonts": "run-script-os",
+    "copyFonts:windows": "xcopy src\\renderer\\fonts\\* dist\\main /Y",
+    "copyFonts:default": "cp src/renderer/fonts/* dist/main"
   },
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/common": "^2.0.0-alpha.18",
-    "@quiet/logger": "^2.0.0-alpha.18",
-    "@quiet/types": "^2.0.0-alpha.18",
+    "@quiet/common": "^2.0.1-alpha.2",
+    "@quiet/logger": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.2",
     "@sentry/electron": "^2.5.4",
-    "backend-bundle": "^2.0.0-alpha.18",
+    "backend-bundle": "^2.0.1-alpha.2",
     "electron-debug": "^3.0.1",
     "electron-localshortcut": "^3.2.1",
     "electron-store": "^8.0.1",
@@ -155,9 +157,9 @@
     "@mui/icons-material": "^5.10.15",
     "@mui/lab": "^5.0.0-alpha.109",
     "@mui/material": "~5.10.15",
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
-    "@quiet/identity": "^2.0.0-alpha.18",
-    "@quiet/state-manager": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
+    "@quiet/identity": "^2.0.1-alpha.2",
+    "@quiet/state-manager": "^2.0.1-alpha.2",
     "@redux-saga/types": "^1.1.0",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^6.19.7",
@@ -256,6 +258,7 @@
     "redux-saga-test-plan": "^4.0.3",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.1.5",
+    "run-script-os": "1.1.6",
     "socket.io-mock": "^1.3.2",
     "source-map-loader": "^4.0.1",
     "standard": "^12.0.1",
diff --git a/packages/desktop/src/renderer/Root.tsx b/packages/desktop/src/renderer/Root.tsx
index 8717893233..608060d374 100644
--- a/packages/desktop/src/renderer/Root.tsx
+++ b/packages/desktop/src/renderer/Root.tsx
@@ -31,7 +31,8 @@ import ChannelCreationModal from './components/ChannelCreationModal/ChannelCreat
 import { SaveStateComponent } from './components/SaveState/SaveStateComponent'
 import UnregisteredModalContainer from './components/widgets/userLabel/unregistered/UnregisteredModal.container'
 import DuplicateModalContainer from './components/widgets/userLabel/duplicate/DuplicateModal.container'
-// Trigger lerna
+import UsernameTakenModalContainer from './components/widgets/usernameTakenModal/UsernameTakenModal.container'
+import PossibleImpersonationAttackModalContainer from './components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.container'
 
 export const persistor = persistStore(store)
 export default () => {
@@ -48,7 +49,9 @@ export default () => {
                 <DuplicateModalContainer />
                 <SearchModal />
                 <ErrorModal />
+                <PossibleImpersonationAttackModalContainer />
                 <LoadingPanel />
+                <UsernameTakenModalContainer />
                 <ChannelCreationModal />
                 <CreateChannel />
                 <JoinCommunity />
diff --git a/packages/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx b/packages/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx
index ead282576a..3ec4ac037f 100644
--- a/packages/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx
+++ b/packages/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx
@@ -155,7 +155,7 @@ export const PerformCommunityActionComponent: React.FC<PerformCommunityActionPro
 }) => {
   const [formSent, setFormSent] = useState(false)
 
-  const [communityName, setCommunityName] = useState('')
+  const [communityName, setCommunityName] = useState('...')
   const [parsedNameDiffers, setParsedNameDiffers] = useState(false)
 
   const waitingForResponse = formSent && !hasReceivedResponse
diff --git a/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.test.tsx b/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.test.tsx
index 0f8656a6c4..e5b406d690 100644
--- a/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.test.tsx
+++ b/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.test.tsx
@@ -4,8 +4,10 @@ import userEvent from '@testing-library/user-event'
 import { screen, waitFor } from '@testing-library/dom'
 import { renderComponent } from '../../testUtils/renderComponent'
 
-import CreateUsernameComponent from './CreateUsernameComponent'
+import CreateUsernameComponent, { UsernameVariant } from './CreateUsernameComponent'
 import { FieldErrors, UsernameErrors } from '../../forms/fieldsErrors'
+import { keyFromCertificate, parseCertificate } from '@quiet/identity'
+import { UserData } from '@quiet/types'
 
 describe('Create username', () => {
   it.each([
@@ -48,3 +50,201 @@ describe('Create username', () => {
     expect(message).toBeVisible()
   })
 })
+
+describe('Username taken', () => {
+  const userCertData = {
+    username: 'userName',
+    onionAddress: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
+    peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
+    dmPublicKey: '0bfb475810c0e26c9fab590d47c3d60ec533bb3c451596acc3cd4f21602e9ad9',
+  }
+
+  const userCertString =
+    'MIICaDCCAg6gAwIBAgIGAYBqyuV2MAoGCCqGSM49BAMCMBkxFzAVBgNVBAMTDnF1aWV0Y29tbXVuaXR5MB4XDTEwMTIyODEwMTAxMFoXDTMwMTIyODEwMTAxMFowSTFHMEUGA1UEAxM+bnFudzRrYzRjNzdmYjQ3bGs1Mm01bDU3aDR0Y3hjZW83eW14ZWtmbjd5aDVtNjZ0NGp2Mm9sYWQub25pb24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZBMmiVmRBRvw+QiL5DYg7WGFUVgA7u90KMpJg4qCaCJJNh7wH2tl0EDsN4FeGmR9AkvtCGd+5vYL0nGcX/oLdo4IBEDCCAQwwCQYDVR0TBAIwADALBgNVHQ8EBAMCAIAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMC8GCSqGSIb3DQEJDAQiBCAL+0dYEMDibJ+rWQ1Hw9YOxTO7PEUVlqzDzU8hYC6a2TAYBgorBgEEAYOMGwIBBAoTCHVzZXJOYW1lMD0GCSsGAQIBDwMBAQQwEy5RbWYzeVNrWXFMRVQ5eHRBdER6dkFyNVBwM2VnSzFIM0M1aUpBWm0xU3BMRXA2MEkGA1UdEQRCMECCPm5xbnc0a2M0Yzc3ZmI0N2xrNTJtNWw1N2g0dGN4Y2VvN3lteGVrZm43eWg1bTY2dDRqdjJvbGFkLm9uaW9uMAoGCCqGSM49BAMCA0gAMEUCIF63rnIq8vd86NT9RHSFj7borwwODqyfE7Pw64tGElpIAiEA5ZDSdrDd8OGf+kv7wxByM1Xgmc5m/aydUk+WorbO3Gg='
+  const parsedCert = parseCertificate(userCertString)
+  const userPubKey = keyFromCertificate(parsedCert)
+
+  const registeredUsers: Record<string, UserData> = {
+    [userPubKey]: userCertData,
+  }
+  it('renders component ', () => {
+    const result = renderComponent(
+      <CreateUsernameComponent
+        handleClose={() => {}}
+        open={true}
+        currentUsername={'jack'}
+        variant={UsernameVariant.TAKEN}
+        registeredUsers={registeredUsers}
+        registerUsername={() => {}}
+      />
+    )
+    expect(result.baseElement).toMatchInlineSnapshot(`
+      <body
+        style="padding-right: 1024px; overflow: hidden;"
+      >
+        <div
+          aria-hidden="true"
+        />
+        <div
+          class="MuiModal-root css-1vjugmr-MuiModal-root"
+          role="presentation"
+          zindex="1300"
+        >
+          <div
+            aria-hidden="true"
+            class="MuiBackdrop-root css-i9fmh8-MuiBackdrop-root-MuiModal-backdrop"
+            style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+          />
+          <div
+            data-testid="sentinelStart"
+            tabindex="0"
+          />
+          <div
+            class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column Modalcentered css-6gh8l0-MuiGrid-root"
+            tabindex="-1"
+          >
+            <div
+              class="MuiGrid-root MuiGrid-container MuiGrid-item Modalheader ModalheaderBorder css-lx31tv-MuiGrid-root"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true css-1r61agb-MuiGrid-root"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-1vd824g-MuiGrid-root"
+                >
+                  <h6
+                    class="MuiTypography-root MuiTypography-subtitle1 MuiTypography-alignCenter Modaltitle Modalbold css-jxzupi-MuiTypography-root"
+                    style="margin-left: 36px;"
+                  >
+                    Username taken
+                  </h6>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
+                >
+                  <div
+                    class="MuiGrid-root MuiGrid-container MuiGrid-item Modalactions css-hoc6b0-MuiGrid-root"
+                    data-testid="createUsernameModalActions"
+                  >
+                    <button
+                      class="MuiButtonBase-root MuiIconButton-root IconButtonroot MuiIconButton-sizeMedium css-c8hoqc-MuiButtonBase-root-MuiIconButton-root"
+                      tabindex="0"
+                      type="button"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                        data-testid="ClearIcon"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"
+                        />
+                      </svg>
+                      <span
+                        class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+                      />
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="MuiGrid-root MuiGrid-container MuiGrid-item ModalfullPage css-1h16bbz-MuiGrid-root"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item Modalcontent css-1f064cs-MuiGrid-root"
+                style="width: 600px;"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column css-1j6kke6-MuiGrid-root"
+                >
+                  <form>
+                    <div
+                      class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column CreateUsernameComponent-fullContainer css-1e5jxqd-MuiGrid-root"
+                    >
+                      <p
+                        class="MuiTypography-root MuiTypography-body2 CreateUsernameComponent-marginMedium css-16d47hw-MuiTypography-root"
+                      >
+                        We’re sorry, but the username 
+                        <strong>
+                          @jack
+                        </strong>
+                         was already claimed by someone else. 
+                        <br />
+                        Can you choose another name?
+                      </p>
+                      <p
+                        class="MuiTypography-root MuiTypography-body2 CreateUsernameComponent-inputLabel css-16d47hw-MuiTypography-root"
+                      >
+                        Enter username
+                      </p>
+                      <div
+                        class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root CreateUsernameComponent-focus CreateUsernameComponent-margin css-wb57ya-MuiFormControl-root-MuiTextField-root"
+                      >
+                        <div
+                          class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl css-143wfni-MuiInputBase-root-MuiOutlinedInput-root"
+                        >
+                          <input
+                            aria-invalid="false"
+                            class="MuiInputBase-input MuiOutlinedInput-input css-24rejj-MuiInputBase-input-MuiOutlinedInput-input"
+                            id=":ra:"
+                            name="userName"
+                            placeholder="Username"
+                            type="text"
+                            value=""
+                          />
+                          <fieldset
+                            aria-hidden="true"
+                            class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
+                          >
+                            <legend
+                              class="css-ihdtdm"
+                            >
+                              <span
+                                class="notranslate"
+                              >
+                                ​
+                              </span>
+                            </legend>
+                          </fieldset>
+                        </div>
+                      </div>
+                      <p
+                        class="MuiTypography-root MuiTypography-body2 css-xseqde-MuiTypography-root"
+                      />
+                      <span
+                        class="MuiTypography-root MuiTypography-caption css-1d4bzk2-MuiTypography-root"
+                        style="margin-top: 8px;"
+                      >
+                        You can choose any username you like. No spaces or special characters.
+                      </span>
+                      <div
+                        class="CreateUsernameComponent-gutter"
+                      />
+                      <button
+                        class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium CreateUsernameComponent-button CreateUsernameComponent-buttonModern css-1fotjar-MuiButtonBase-root-MuiButton-root"
+                        tabindex="0"
+                        type="submit"
+                      >
+                        Continue
+                        <span
+                          class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+                        />
+                      </button>
+                    </div>
+                  </form>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            data-testid="sentinelEnd"
+            tabindex="0"
+          />
+        </div>
+      </body>
+    `)
+  })
+})
diff --git a/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.tsx b/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.tsx
index a0be2008c5..2e0e904b3b 100644
--- a/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.tsx
+++ b/packages/desktop/src/renderer/components/CreateUsername/CreateUsername.tsx
@@ -32,7 +32,11 @@ const CreateUsername = () => {
       dispatch(errors.actions.clearError(error))
     }
 
-    dispatch(identity.actions.registerUsername(nickname))
+    dispatch(
+      identity.actions.registerUsername({
+        nickname,
+      })
+    )
     dispatch(network.actions.setLoadingPanelType(LoadingPanelType.Joining))
     loadingPanelModal.handleOpen()
   }
diff --git a/packages/desktop/src/renderer/components/CreateUsername/CreateUsernameComponent.tsx b/packages/desktop/src/renderer/components/CreateUsername/CreateUsernameComponent.tsx
index b26d4b49a5..b8d9e64e94 100644
--- a/packages/desktop/src/renderer/components/CreateUsername/CreateUsernameComponent.tsx
+++ b/packages/desktop/src/renderer/components/CreateUsername/CreateUsernameComponent.tsx
@@ -4,18 +4,15 @@ import classNames from 'classnames'
 import { Controller, useForm } from 'react-hook-form'
 import Typography from '@mui/material/Typography'
 import Grid from '@mui/material/Grid'
-
 import WarningIcon from '@mui/icons-material/Warning'
-
 import Modal from '../ui/Modal/Modal'
-
 import { LoadingButton } from '../ui/LoadingButton/LoadingButton'
 import { TextInput } from '../../forms/components/textInput'
 import { userNameField } from '../../forms/fields/createUserFields'
-
 import { parseName } from '@quiet/common'
+import { UserData } from '@quiet/types'
 
-const PREFIX = 'CreateUsernameComponent'
+const PREFIX = 'CreateUsernameComponent-'
 
 const classes = {
   focus: `${PREFIX}focus`,
@@ -31,6 +28,10 @@ const classes = {
   rootBar: `${PREFIX}rootBar`,
   progressBar: `${PREFIX}progressBar`,
   info: `${PREFIX}info`,
+  inputLabel: `${PREFIX}inputLabel`,
+  marginMedium: `${PREFIX}marginMedium`,
+  buttonModern: `${PREFIX}buttonModern`,
+  buttonMargin: `${PREFIX}buttonMargin`,
 }
 
 const StyledModalContent = styled(Grid)(({ theme }) => ({
@@ -81,6 +82,11 @@ const StyledModalContent = styled(Grid)(({ theme }) => ({
     fontWeight: 'normal',
   },
 
+  [`& .${classes.buttonModern}`]: {
+    borderRadius: 8,
+    width: 110,
+  },
+
   [`& .${classes.title}`]: {
     marginBottom: 24,
   },
@@ -113,6 +119,16 @@ const StyledModalContent = styled(Grid)(({ theme }) => ({
     lineHeight: '19px',
     color: theme.palette.colors.darkGray,
   },
+
+  [`& .${classes.inputLabel}`]: {
+    marginTop: 24,
+    marginBottom: 2,
+    color: theme.palette.colors.black30,
+  },
+
+  [`& .${classes.marginMedium}`]: {
+    marginTop: 24,
+  },
 }))
 
 const userFields = {
@@ -123,12 +139,20 @@ interface CreateUserValues {
   userName: string
 }
 
+export enum UsernameVariant {
+  NEW = 'new',
+  TAKEN = 'taken',
+}
+
 export interface CreateUsernameComponentProps {
   open: boolean
   registerUsername: (name: string) => void
   certificateRegistrationError?: string
   certificate?: string | null
   handleClose: () => void
+  registeredUsers?: Record<string, UserData>
+  currentUsername?: string
+  variant?: UsernameVariant
 }
 
 export const CreateUsernameComponent: React.FC<CreateUsernameComponentProps> = ({
@@ -137,7 +161,13 @@ export const CreateUsernameComponent: React.FC<CreateUsernameComponentProps> = (
   certificateRegistrationError,
   certificate,
   handleClose,
+  currentUsername,
+  registeredUsers,
+  variant = UsernameVariant.NEW,
 }) => {
+  const isNewUser = variant === UsernameVariant.NEW
+  const [isUsernameRequested, setIsUsernameRequested] = useState(false)
+
   const [formSent, setFormSent] = useState(false)
   const [userName, setUserName] = useState('')
   const [parsedNameDiffers, setParsedNameDiffers] = useState(false)
@@ -151,12 +181,18 @@ export const CreateUsernameComponent: React.FC<CreateUsernameComponentProps> = (
     setValue,
     setError,
     control,
+    clearErrors,
   } = useForm<CreateUserValues>({
     mode: 'onTouched',
   })
 
   const onSubmit = (values: CreateUserValues) => {
-    submitForm(registerUsername, values, setFormSent)
+    if (isNewUser) {
+      submitForm(registerUsername, values, setFormSent)
+    } else {
+      registerUsername(parseName(values.userName))
+      setIsUsernameRequested(true)
+    }
   }
 
   const submitForm = (
@@ -169,9 +205,16 @@ export const CreateUsernameComponent: React.FC<CreateUsernameComponentProps> = (
   }
 
   const onChange = (name: string) => {
+    clearErrors('userName')
     const parsedName = parseName(name)
     setUserName(parsedName)
     setParsedNameDiffers(name !== parsedName)
+    if (registeredUsers && !isNewUser) {
+      const allUsersSet = new Set(Object.values(registeredUsers).map(user => user.username))
+      if (allUsersSet.has(name)) {
+        setError('userName', { message: `${name} is already taken` })
+      }
+    }
   }
 
   React.useEffect(() => {
@@ -188,77 +231,136 @@ export const CreateUsernameComponent: React.FC<CreateUsernameComponentProps> = (
   }, [certificateRegistrationError])
 
   return (
-    <Modal open={open} handleClose={handleClose} testIdPrefix='createUsername' isCloseDisabled={true}>
+    <Modal
+      open={open}
+      handleClose={handleClose}
+      testIdPrefix='createUsername'
+      isCloseDisabled={isNewUser}
+      isBold={!isNewUser}
+      addBorder={!isNewUser}
+      title={isNewUser ? undefined : isUsernameRequested ? 'New username requested' : 'Username taken'}
+    >
       <StyledModalContent container direction='column'>
-        <>
-          <form onSubmit={handleSubmit(onSubmit)}>
-            <Grid container justifyContent='flex-start' direction='column' className={classes.fullContainer}>
-              <Typography variant='h3' className={classes.title}>
-                Register a username
-              </Typography>
-              <Typography variant='body2'>Choose your favorite username</Typography>
-              <Controller
-                control={control}
-                defaultValue={''}
-                rules={userFields.userName.validation}
-                name={'userName'}
-                render={({ field }) => (
-                  <TextInput
-                    {...userFields.userName.fieldProps}
-                    fullWidth
-                    classes={classNames({
-                      [classes.focus]: true,
-                      [classes.margin]: true,
-                      [classes.error]: errors.userName,
-                    })}
-                    placeholder={'Enter a username'}
-                    errors={errors}
-                    onPaste={e => e.preventDefault()}
-                    variant='outlined'
-                    onchange={event => {
-                      event.persist()
-                      const value = event.target.value
-                      onChange(value)
-                      // Call default
-                      field.onChange(event)
-                    }}
-                    onblur={() => {
-                      field.onBlur()
-                    }}
-                    value={field.value}
-                  />
+        {!isUsernameRequested ? (
+          <>
+            <form onSubmit={handleSubmit(onSubmit)}>
+              <Grid container justifyContent='flex-start' direction='column' className={classes.fullContainer}>
+                {isNewUser ? (
+                  <>
+                    <Typography variant='h3' className={classes.title}>
+                      Register a username
+                    </Typography>
+                    <Typography variant='body2'>Choose your favorite username</Typography>
+                  </>
+                ) : (
+                  <>
+                    <Typography variant='body2' className={classes.marginMedium}>
+                      We’re sorry, but the username <strong>{currentUsername && `@${currentUsername}`}</strong> was
+                      already claimed by someone else. <br />
+                      Can you choose another name?
+                    </Typography>
+
+                    <Typography variant='body2' className={classes.inputLabel}>
+                      Enter username
+                    </Typography>
+                  </>
                 )}
-              />
-              <div className={classes.gutter}>
-                {!errors.userName && userName.length > 0 && parsedNameDiffers && (
-                  <Grid container alignItems='center' direction='row'>
-                    <Grid item className={classes.iconDiv}>
-                      <WarningIcon className={classes.warrningIcon} />
-                    </Grid>
-                    <Grid item xs>
-                      <Typography
-                        variant='body2'
-                        className={classes.warrningMessage}
-                        data-testid={'createUserNameWarning'}
-                      >
-                        Your username will be registered as <b>{`@${userName}`}</b>
-                      </Typography>
-                    </Grid>
-                  </Grid>
+
+                <Controller
+                  control={control}
+                  defaultValue={''}
+                  rules={userFields.userName.validation}
+                  name={'userName'}
+                  render={({ field }) => (
+                    <TextInput
+                      {...userFields.userName.fieldProps}
+                      fullWidth
+                      classes={classNames({
+                        [classes.focus]: true,
+                        [classes.margin]: true,
+                        [classes.error]: errors.userName,
+                      })}
+                      placeholder={isNewUser ? 'Enter a username' : 'Username'}
+                      errors={errors}
+                      onPaste={e => e.preventDefault()}
+                      variant='outlined'
+                      onchange={event => {
+                        event.persist()
+                        const value = event.target.value
+                        onChange(value)
+                        // Call default
+                        field.onChange(event)
+                      }}
+                      onblur={() => {
+                        field.onBlur()
+                      }}
+                      value={field.value}
+                    />
+                  )}
+                />
+
+                {!isNewUser && (
+                  <Typography variant='caption' style={{ marginTop: 8 }}>
+                    You can choose any username you like. No spaces or special characters.
+                  </Typography>
                 )}
-              </div>
-              <LoadingButton
-                variant='contained'
-                color='primary'
-                inProgress={waitingForResponse}
-                disabled={waitingForResponse}
-                type='submit'
-                text={'Register'}
-                classes={{ button: classes.button }}
-              />
-            </Grid>
-          </form>
-        </>
+                <div className={classes.gutter}>
+                  {!errors.userName && userName.length > 0 && parsedNameDiffers && (
+                    <Grid container alignItems='center' direction='row'>
+                      <Grid item className={classes.iconDiv}>
+                        <WarningIcon className={classes.warrningIcon} />
+                      </Grid>
+                      <Grid item xs>
+                        <Typography
+                          variant='body2'
+                          className={classes.warrningMessage}
+                          data-testid={'createUserNameWarning'}
+                        >
+                          Your username will be registered as <b>{`@${userName}`}</b>
+                        </Typography>
+                      </Grid>
+                    </Grid>
+                  )}
+                </div>
+                <LoadingButton
+                  variant='contained'
+                  color='primary'
+                  inProgress={waitingForResponse}
+                  disabled={waitingForResponse || Boolean(errors.userName)}
+                  type='submit'
+                  text={isNewUser ? 'Register' : 'Continue'}
+                  classes={{
+                    button: classNames({
+                      [classes.button]: true,
+                      [classes.buttonModern]: !isNewUser,
+                    }),
+                  }}
+                />
+              </Grid>
+            </form>
+          </>
+        ) : (
+          <>
+            <Typography variant='body2' className={classes.marginMedium}>
+              Great! Your new username should be registered automatically the next time the community owner is online.
+            </Typography>
+
+            <LoadingButton
+              variant='contained'
+              color='primary'
+              type='submit'
+              text={'Continue'}
+              onClick={handleClose}
+              classes={{
+                button: classNames({
+                  [classes.button]: true,
+                  [classes.buttonModern]: true,
+                  [classes.marginMedium]: true,
+                }),
+              }}
+            />
+          </>
+        )}
       </StyledModalContent>
     </Modal>
   )
diff --git a/packages/desktop/src/renderer/components/CreateUsername/UsernameCreated/UsernameCreated.test.tsx b/packages/desktop/src/renderer/components/CreateUsername/UsernameCreated/UsernameCreated.test.tsx
index be91805216..113b477827 100644
--- a/packages/desktop/src/renderer/components/CreateUsername/UsernameCreated/UsernameCreated.test.tsx
+++ b/packages/desktop/src/renderer/components/CreateUsername/UsernameCreated/UsernameCreated.test.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 import { renderComponent } from '../../../testUtils/renderComponent'
-
 import { UsernameCreated } from './UsernameCreated'
 
 describe('UsernameCreated', () => {
diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx
index 9e19f5b6ca..19f8df4af5 100644
--- a/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx
+++ b/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx
@@ -16,7 +16,7 @@ import { capitalizeFirstLetter } from '@quiet/common'
 export const LeaveCommunity: React.FC = () => {
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let communityName = '' // Prevent error on initial app start
+  let communityName = '...' // Prevent error on initial app start
 
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)
diff --git a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx
index 10afcc0fcb..974a194bcb 100644
--- a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx
+++ b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx
@@ -89,7 +89,9 @@ describe('IdentityPanel', () => {
             >
               <h4
                 class="MuiTypography-root MuiTypography-h4 IdentityPanelnickname css-ajdqea-MuiTypography-root"
-              />
+              >
+                ...
+              </h4>
               <svg
                 aria-hidden="true"
                 class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall css-ptiqhd-MuiSvgIcon-root"
@@ -144,7 +146,9 @@ describe('IdentityPanel', () => {
             >
               <h4
                 class="MuiTypography-root MuiTypography-h4 IdentityPanelnickname css-ajdqea-MuiTypography-root"
-              />
+              >
+                ...
+              </h4>
               <svg
                 aria-hidden="true"
                 class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall css-ptiqhd-MuiSvgIcon-root"
diff --git a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx
index 6cbe2dd540..7737ca9d7a 100644
--- a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx
+++ b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx
@@ -46,7 +46,7 @@ export interface IdentityPanelProps {
 }
 
 export const IdentityPanel: React.FC<IdentityPanelProps> = ({ currentCommunity, accountSettingsModal }) => {
-  const communityName = currentCommunity?.name || ''
+  const communityName = currentCommunity?.name || '...'
   return (
     <IdentityPanelButtonStyled>
       <Button
diff --git a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.test.tsx b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.test.tsx
index 5ea510e3df..d55f830c5e 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.test.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.test.tsx
@@ -36,6 +36,7 @@ describe('BasicMessage', () => {
           >
             <div
               class="MuiListItemText-root BasicMessageComponentmessageCard css-tlelie-MuiListItemText-root"
+              data-testid="userMessagesWrapper-gringo-0"
             >
               <div
                 class="MuiGrid-root MuiGrid-container MuiGrid-wrap-xs-nowrap css-aii0rt-MuiGrid-root"
@@ -124,6 +125,7 @@ describe('BasicMessage', () => {
           >
             <div
               class="MuiListItemText-root BasicMessageComponentmessageCard css-tlelie-MuiListItemText-root"
+              data-testid="userMessagesWrapper-gringo-0"
             >
               <div
                 class="MuiGrid-root MuiGrid-container MuiGrid-wrap-xs-nowrap css-aii0rt-MuiGrid-root"
@@ -222,6 +224,7 @@ describe('BasicMessage', () => {
           >
             <div
               class="MuiListItemText-root BasicMessageComponentmessageCard css-tlelie-MuiListItemText-root"
+              data-testid="userMessagesWrapper-gringo-0"
             >
               <div
                 class="MuiGrid-root MuiGrid-container MuiGrid-wrap-xs-nowrap css-aii0rt-MuiGrid-root"
@@ -324,6 +327,7 @@ describe('BasicMessage', () => {
           >
             <div
               class="MuiListItemText-root BasicMessageComponentmessageCard css-tlelie-MuiListItemText-root"
+              data-testid="userMessagesWrapper-gringo-0"
             >
               <div
                 class="MuiGrid-root MuiGrid-container MuiGrid-wrap-xs-nowrap css-aii0rt-MuiGrid-root"
diff --git a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx
index b4cc04c6fc..fe6ab39c28 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx
@@ -193,6 +193,7 @@ export const BasicMessageComponent: React.FC<BasicMessageProps & FileActionsProp
       <ListItemText
         disableTypography
         className={classes.messageCard}
+        data-testid={`userMessagesWrapper-${messageDisplayData.nickname}-${messageDisplayData.id}`}
         primary={
           <Grid container direction='row' justifyContent='flex-start' alignItems='flex-start' wrap={'nowrap'}>
             <Grid item className={classNames({ [classes.avatar]: true })}>
@@ -218,8 +219,8 @@ export const BasicMessageComponent: React.FC<BasicMessageProps & FileActionsProp
                       {infoMessage ? 'Quiet' : messageDisplayData.nickname}
                     </Typography>
                   </Grid>
-                  {userLabel && (
-                    <Grid>
+                  {userLabel && !infoMessage && (
+                    <Grid data-testid={`userLabel-${messageDisplayData.nickname}-${messageDisplayData.id}`}>
                       <UserLabel
                         username={messageDisplayData.nickname}
                         type={userLabel}
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
index bd8d8ea4d9..3ca9d2cf6d 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
@@ -16,6 +16,7 @@ const Template: ComponentStory<typeof ChannelInputComponent> = args => {
 
 export const Component = Template.bind({})
 export const Disabled = Template.bind({})
+export const LongMessage = Template.bind({})
 
 const args: ChannelInputProps = {
   channelId: 'channelId',
@@ -48,8 +49,220 @@ const argsDisabledInput: ChannelInputProps = {
   handleClipboardFiles: function (arg: ArrayBuffer, ext: string, name: string): void {},
 }
 
+const initialMessage = `An h1 header
+============
+Paragraphs are separated by a blank line.
+2nd paragraph. *Italic*, **bold**, and monospace. Itemized lists
+look like:
+* this one
+* that one
+* the other one
+Note that --- not considering the asterisk --- the actual text
+content starts at 4-columns in.
+> Block quotes are
+> written like so.
+>
+> They can span multiple paragraphs,
+> if you like.
+Use 3 dashes for an em-dash. Use 2 dashes for ranges (ex., "it's all
+in chapters 12--14"). Three dots ... will be converted to an ellipsis.
+Unicode is supported. :relaxed:
+An h2 header
+------------
+Here's a numbered list:
+1. first item
+2. second item
+3. third item
+Note again how the actual text starts at 4 columns in (4 characters
+from the left side). Here's a code sample:
+# Let me re-iterate ...
+for i in 1 .. 10 { do-something(i) }
+As you probably guessed, indented 4 spaces. By the way, instead of
+indenting the block, you can use delimited blocks, if you like:
+~~~
+define foobar() {
+print "Welcome to flavor country!";
+}
+~~~
+(which makes copying & pasting easier). You can optionally mark the
+delimited block for Pandoc to syntax highlight it:
+~~~python
+import time
+# Quick, count to ten!
+for i in range(10):
+# (but not *too* quick)
+time.sleep(0.5)
+print i
+~~~
+### An h3 header ###
+Now a nested list:
+1. First, get these ingredients:
+* carrots
+* celery
+* lentils
+2. Boil some water.
+3. Dump everything in the pot and follow
+this algorithm:
+find wooden spoon
+uncover pot
+stir
+cover pot
+balance wooden spoon precariously on pot handle
+wait 10 minutes
+goto first step (or shut off burner when done)
+Do not bump wooden spoon or it will fall.
+Notice again how text always lines up on 4-space indents (including
+that last line which continues item 3 above).
+Here's a link to [a website](http://foo.bar), to a [local
+doc](local-doc.html), and to a [section heading in the current
+doc](#an-h2-header). Here's a footnote [^1].
+[^1]: Footnote text goes here.
+Tables can look like this:
+size material color
+---- ------------ ------------
+9 leather brown
+10 hemp canvas natural
+11 glass transparent
+Table: Shoes, their sizes, and what they're made of
+(The above is the caption for the table.) Pandoc also supports
+multi-line tables:
+-------- -----------------------
+keyword text
+-------- -----------------------
+red Sunsets, apples, and
+other red or reddish
+things.
+green Leaves, grass, frogs
+and other things it's
+not easy being.
+-------- -----------------------
+A horizontal rule follows.
+***
+Here's a definition list:
+apples
+: Good for making applesauce.
+oranges
+: Citrus!
+tomatoes
+: There's no "e" in tomatoe.
+Again, text is indented 4 spaces. (Put a blank line between each
+term/definition pair to spread things out more.)
+Here's a "line block":
+| Line one
+| Line too
+| Line tree
+and images can be specified like so:
+![example image](example-image.jpg "An exemplary image")
+Inline math equations go in like so: $mega = dhi / dt$. Display
+math should get its own line and be put in in double-dollarsigns:And note that you can backslash-escape any punctuation characters
+which you wish to be displayed literally, ex.: etc.
+An h1 header
+============
+Paragraphs are separated by a blank line.
+2nd paragraph. *Italic*, **bold**, and monospace. Itemized lists
+look like:
+* this one
+* that one
+* the other one
+Note that --- not considering the asterisk --- the actual text
+content starts at 4-columns in.
+> Block quotes are
+> written like so.
+>
+> They can span multiple paragraphs,
+> if you like.
+Use 3 dashes for an em-dash. Use 2 dashes for ranges (ex., "it's all
+in chapters 12--14"). Three dots ... will be converted to an ellipsis.
+Unicode is supported. :relaxed:
+An h2 header
+------------
+Here's a numbered list:
+1. first item
+2. second item
+3. third item
+Note again how the actual text starts at 4 columns in (4 characters
+from the left side). Here's a code sample:
+# Let me re-iterate ...
+for i in 1 .. 10 { do-something(i) }
+As you probably guessed, indented 4 spaces. By the way, instead of
+indenting the block, you can use delimited blocks, if you like:
+~~~
+define foobar() {
+print "Welcome to flavor country!";
+}
+~~~
+(which makes copying & pasting easier). You can optionally mark the
+delimited block for Pandoc to syntax highlight it:
+~~~python
+import time
+# Quick, count to ten!
+for i in range(10):
+# (but not *too* quick)
+time.sleep(0.5)
+print i
+~~~
+### An h3 header ###
+Now a nested list:
+1. First, get these ingredients:
+* carrots
+* celery
+* lentils
+2. Boil some water.
+3. Dump everything in the pot and follow
+this algorithm:
+find wooden spoon
+uncover pot
+stir
+cover pot
+balance wooden spoon precariously on pot handle
+wait 10 minutes
+goto first step (or shut off burner when done)
+Do not bump wooden spoon or it will fall.
+Notice again how text always lines up on 4-space indents (including
+that last line which continues item 3 above).
+Here's a link to [a website](http://foo.bar), to a [local
+doc](local-doc.html), and to a [section heading in the current
+doc](#an-h2-header). Here's a footnote [^1].
+[^1]: Footnote text goes here.
+Tables can look like this:
+size material color
+---- ------------ ------------
+9 leather brown
+10 hemp canvas natural
+11 glass transparent
+Table: Shoes, their sizes, and what they're made of
+(The above is the caption for the table.) Pandoc also supports
+multi-line tables:
+-------- -----------------------
+keyword text
+-------- -----------------------
+red Sunsets, apples, and
+other red or reddish
+things.
+green Leaves, grass, frogs
+and other things it's
+not easy being.
+-------- -----------------------`
+
+const argsLongMessage: ChannelInputProps = {
+  channelId: 'channelId',
+  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
+  inputPlaceholder: '#general as @alice',
+  initialMessage: initialMessage,
+  onChange: function (_arg: string): void {},
+  onKeyPress: function (input: string): void {
+    console.log('send message', input)
+  },
+  infoClass: '',
+  setInfoClass: function (_arg: string): void {},
+  openFilesDialog: () => {},
+  handleOpenFiles: _arg => {},
+  handleClipboardFiles: function (arg: ArrayBuffer, ext: string, name: string): void {},
+}
+
 Component.args = args
 Disabled.args = argsDisabledInput
+LongMessage.args = argsLongMessage
 
 const component: ComponentMeta<typeof ChannelInputComponent> = {
   title: 'Components/ChannelInput',
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
index 91206e8d55..1568bf8301 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
@@ -28,7 +28,7 @@ describe('ChannelInput', () => {
       <body>
         <div>
           <div
-            class="MuiGrid-root ChannelInputroot css-1rkz2j3-MuiGrid-root"
+            class="MuiGrid-root ChannelInputroot css-j3fbgh-MuiGrid-root"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column ChannelInputrootContent css-6gh8l0-MuiGrid-root"
@@ -40,7 +40,7 @@ describe('ChannelInput', () => {
                   class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextfield css-1r61agb-MuiGrid-root"
                 >
                   <div
-                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-1vd824g-MuiGrid-root"
+                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextArea css-1vd824g-MuiGrid-root"
                   >
                     <div
                       class="ChannelInputinput"
@@ -121,7 +121,7 @@ describe('ChannelInput', () => {
       <body>
         <div>
           <div
-            class="MuiGrid-root ChannelInputroot ChannelInputnotAllowed css-1rkz2j3-MuiGrid-root"
+            class="MuiGrid-root ChannelInputroot ChannelInputnotAllowed css-j3fbgh-MuiGrid-root"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column ChannelInputrootContent css-6gh8l0-MuiGrid-root"
@@ -133,7 +133,7 @@ describe('ChannelInput', () => {
                   class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextfield css-1r61agb-MuiGrid-root"
                 >
                   <div
-                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-1vd824g-MuiGrid-root"
+                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextArea css-1vd824g-MuiGrid-root"
                   >
                     <div
                       class="ChannelInputinput"
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
index 3297a6c5b5..c6921b7746 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
@@ -41,8 +41,11 @@ const classes = {
   notAllowed: `${PREFIX}notAllowed`,
   inputFiles: `${PREFIX}inputFiles`,
   icons: `${PREFIX}icons`,
+  textArea: `${PREFIX}textArea`,
 }
 
+const maxHeight = 300
+
 const StyledChannelInput = styled(Grid)(({ theme }) => ({
   [`&.${classes.root}`]: {
     background: '#fff',
@@ -78,7 +81,7 @@ const StyledChannelInput = styled(Grid)(({ theme }) => ({
   },
   [`& .${classes.textfield}`]: {
     border: `1px solid ${theme.palette.colors.veryLightGray}`,
-    maxHeight: 300,
+    maxHeight: maxHeight,
     overflowY: 'auto',
     borderRadius: 4,
     '&:hover': {
@@ -197,6 +200,9 @@ const StyledChannelInput = styled(Grid)(({ theme }) => ({
     alignItems: 'center',
     alignCntent: 'stretch',
   },
+  [`& .${classes.textArea}`]: {
+    maxHeight: maxHeight,
+  },
 }))
 
 export interface ChannelInputProps {
@@ -571,7 +577,7 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
               justifyContent='center'
               alignItems='center'
             >
-              <Grid item xs>
+              <Grid item xs className={classes.textArea}>
                 <ContentEditable
                   ref={inputRef}
                   placeholder={`Message ${inputPlaceholder}`}
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelMessages.test.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelMessages.test.tsx
index a53a4593d3..b991dad766 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelMessages.test.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelMessages.test.tsx
@@ -87,6 +87,7 @@ describe('ChannelMessages', () => {
                 >
                   <div
                     class="MuiListItemText-root BasicMessageComponentmessageCard css-tlelie-MuiListItemText-root"
+                    data-testid="userMessagesWrapper-string-string"
                   >
                     <div
                       class="MuiGrid-root MuiGrid-container MuiGrid-wrap-xs-nowrap css-aii0rt-MuiGrid-root"
diff --git a/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.component.tsx b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.component.tsx
new file mode 100644
index 0000000000..2c3b45a692
--- /dev/null
+++ b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.component.tsx
@@ -0,0 +1,80 @@
+import React from 'react'
+import Modal from '../../ui/Modal/Modal'
+import { Button, Grid, Typography } from '@mui/material'
+import { styled } from '@mui/material/styles'
+import WarnIcon from '../../../static/images/exclamationMark.svg'
+
+const PREFIX = 'PossibleImpersonationAttackModalComponent-'
+
+const classes = {
+  bodyText: `${PREFIX}bodyText`,
+  button: `${PREFIX}button`,
+  image: `${PREFIX}image`,
+}
+
+const StyledGrid = styled(Grid)(({ theme }) => ({
+  [`& .${classes.bodyText}`]: {
+    textAlign: 'center',
+    width: '65%',
+    margin: '24px 0 4px',
+  },
+  [`& .${classes.image}`]: {
+    width: '70px',
+    height: '70px',
+    margin: '30px 0 24px',
+  },
+  [`& .${classes.button}`]: {
+    marginTop: 16,
+    textTransform: 'none',
+    padding: '0 24px',
+    height: 40,
+    borderRadius: '8px',
+    color: theme.palette.colors.white,
+    backgroundColor: theme.palette.colors.quietBlue,
+    '&:hover': {
+      opacity: 0.7,
+      backgroundColor: theme.palette.colors.quietBlue,
+    },
+  },
+}))
+
+export interface PossibleImpersonationAttackModalComponentProps {
+  communityName: string
+  leaveCommunity: () => void
+  open: boolean
+  handleClose: () => void
+}
+
+const PossibleImpersonationAttackModalComponent: React.FC<PossibleImpersonationAttackModalComponentProps> = ({
+  communityName,
+  leaveCommunity,
+  handleClose,
+  open,
+}) => {
+  return (
+    <Modal open={open} handleClose={handleClose} title={'Warning!'} isBold addBorder>
+      <StyledGrid
+        container
+        item
+        direction='column'
+        justifyContent='flex-start'
+        alignItems='center'
+        data-testid={'possible-impersonation-attack-modal-component'}
+      >
+        <img className={classes.image} src={WarnIcon} />
+        <Typography variant='h4'>Possible impersonation attack</Typography>
+        <Typography className={classes.bodyText} variant='body2'>
+          The owner of <strong>{communityName}</strong> has registered an invalid username. Either something is very
+          broken, the community owner is trying to impersonate other users, or the community owner has been hacked.
+          <br />
+          <strong>This should never happen and we recommend leaving this community immediately!</strong>
+        </Typography>
+        <Button className={classes.button} data-testid='unregistered-button' onClick={leaveCommunity}>
+          Leave community
+        </Button>
+      </StyledGrid>
+    </Modal>
+  )
+}
+
+export default PossibleImpersonationAttackModalComponent
diff --git a/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.container.tsx b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.container.tsx
new file mode 100644
index 0000000000..bd7b75f913
--- /dev/null
+++ b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.container.tsx
@@ -0,0 +1,41 @@
+import { capitalizeFirstLetter } from '@quiet/common'
+import { communities, users } from '@quiet/state-manager'
+import React, { useEffect } from 'react'
+import { useSelector } from 'react-redux'
+import { clearCommunity } from '../../..'
+import { useModal } from '../../../containers/hooks'
+import { ModalName } from '../../../sagas/modals/modals.types'
+import PossibleImpersonationAttackModalComponent from './PossibleImpersonationAttackModal.component'
+
+const PossibleImpersonationAttackModalContainer = () => {
+  const possibleImpersonationAttackModal = useModal(ModalName.possibleImpersonationAttackModal)
+
+  const community = useSelector(communities.selectors.currentCommunity)
+  const duplicateCerts = useSelector(users.selectors.duplicateCerts)
+
+  let communityName = '...'
+
+  if (community?.name) {
+    communityName = capitalizeFirstLetter(community.name)
+  }
+
+  const leaveCommunity = async () => {
+    await clearCommunity()
+  }
+
+  useEffect(() => {
+    if (duplicateCerts) {
+      possibleImpersonationAttackModal.handleOpen()
+    }
+  }, [duplicateCerts])
+
+  return (
+    <PossibleImpersonationAttackModalComponent
+      communityName={communityName}
+      leaveCommunity={leaveCommunity}
+      {...possibleImpersonationAttackModal}
+    />
+  )
+}
+
+export default PossibleImpersonationAttackModalContainer
diff --git a/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.stories.tsx b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.stories.tsx
new file mode 100644
index 0000000000..bd94e8c525
--- /dev/null
+++ b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.stories.tsx
@@ -0,0 +1,33 @@
+import React from 'react'
+import { ComponentStory, ComponentMeta } from '@storybook/react'
+import { withTheme } from '../../../storybook/decorators'
+import PossibleImpersonationAttackModalComponent, {
+  PossibleImpersonationAttackModalComponentProps,
+} from './PossibleImpersonationAttackModal.component'
+
+const Template: ComponentStory<typeof PossibleImpersonationAttackModalComponent> = args => {
+  return (
+    <div style={{ height: '800px', position: 'relative' }}>
+      <PossibleImpersonationAttackModalComponent {...args} />
+    </div>
+  )
+}
+
+export const Component = Template.bind({})
+
+const args: PossibleImpersonationAttackModalComponentProps = {
+  handleClose: function (): void {},
+  open: true,
+  communityName: 'devteam',
+  leaveCommunity: function (): void {},
+}
+
+Component.args = args
+
+const component: ComponentMeta<typeof PossibleImpersonationAttackModalComponent> = {
+  title: 'Components/PossibleImpersonationAttackModalComponent',
+  decorators: [withTheme],
+  component: PossibleImpersonationAttackModalComponent,
+}
+
+export default component
diff --git a/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.test.tsx b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.test.tsx
new file mode 100644
index 0000000000..5a5e512164
--- /dev/null
+++ b/packages/desktop/src/renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.test.tsx
@@ -0,0 +1,147 @@
+import React from 'react'
+import theme from '../../../theme'
+import { ThemeProvider } from '@mui/material/styles'
+import { renderComponent } from '../../../testUtils/renderComponent'
+import PossibleImpersonationAttackModalComponent from './PossibleImpersonationAttackModal.component'
+
+describe('PossibleImpersonationAttackModal', () => {
+  it('renderComponent', () => {
+    const result = renderComponent(
+      <ThemeProvider theme={theme}>
+        <PossibleImpersonationAttackModalComponent
+          handleClose={() => {}}
+          open={true}
+          communityName={'devteam'}
+          leaveCommunity={() => {}}
+        />
+      </ThemeProvider>
+    )
+    expect(result.baseElement).toMatchInlineSnapshot(`
+      <body
+        style="padding-right: 1024px; overflow: hidden;"
+      >
+        <div
+          aria-hidden="true"
+        />
+        <div
+          class="MuiModal-root css-1vjugmr-MuiModal-root"
+          role="presentation"
+          zindex="1300"
+        >
+          <div
+            aria-hidden="true"
+            class="MuiBackdrop-root css-i9fmh8-MuiBackdrop-root-MuiModal-backdrop"
+            style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+          />
+          <div
+            data-testid="sentinelStart"
+            tabindex="0"
+          />
+          <div
+            class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column Modalcentered css-6gh8l0-MuiGrid-root"
+            tabindex="-1"
+          >
+            <div
+              class="MuiGrid-root MuiGrid-container MuiGrid-item Modalheader ModalheaderBorder css-lx31tv-MuiGrid-root"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true css-1r61agb-MuiGrid-root"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-1vd824g-MuiGrid-root"
+                >
+                  <h6
+                    class="MuiTypography-root MuiTypography-subtitle1 MuiTypography-alignCenter Modaltitle Modalbold css-jxzupi-MuiTypography-root"
+                    style="margin-left: 36px;"
+                  >
+                    Warning!
+                  </h6>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
+                >
+                  <div
+                    class="MuiGrid-root MuiGrid-container MuiGrid-item Modalactions css-hoc6b0-MuiGrid-root"
+                    data-testid="ModalActions"
+                  >
+                    <button
+                      class="MuiButtonBase-root MuiIconButton-root IconButtonroot MuiIconButton-sizeMedium css-c8hoqc-MuiButtonBase-root-MuiIconButton-root"
+                      tabindex="0"
+                      type="button"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                        data-testid="ClearIcon"
+                        focusable="false"
+                        viewBox="0 0 24 24"
+                      >
+                        <path
+                          d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"
+                        />
+                      </svg>
+                      <span
+                        class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+                      />
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="MuiGrid-root MuiGrid-container MuiGrid-item ModalfullPage css-1h16bbz-MuiGrid-root"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item Modalcontent css-1f064cs-MuiGrid-root"
+                style="width: 600px;"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-direction-xs-column css-e4g1qd-MuiGrid-root"
+                  data-testid="possible-impersonation-attack-modal-component"
+                >
+                  <img
+                    class="PossibleImpersonationAttackModalComponent-image"
+                    src="test-file-stub"
+                  />
+                  <h4
+                    class="MuiTypography-root MuiTypography-h4 css-ajdqea-MuiTypography-root"
+                  >
+                    Possible impersonation attack
+                  </h4>
+                  <p
+                    class="MuiTypography-root MuiTypography-body2 PossibleImpersonationAttackModalComponent-bodyText css-16d47hw-MuiTypography-root"
+                  >
+                    The owner of 
+                    <strong>
+                      devteam
+                    </strong>
+                     has registered an invalid username. Either something is very broken, the community owner is trying to impersonate other users, or the community owner has been hacked.
+                    <br />
+                    <strong>
+                      This should never happen and we recommend leaving this community immediately!
+                    </strong>
+                  </p>
+                  <button
+                    class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium PossibleImpersonationAttackModalComponent-button css-1skytee-MuiButtonBase-root-MuiButton-root"
+                    data-testid="unregistered-button"
+                    tabindex="0"
+                    type="button"
+                  >
+                    Leave community
+                    <span
+                      class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+                    />
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            data-testid="sentinelEnd"
+            tabindex="0"
+          />
+        </div>
+      </body>
+    `)
+  })
+})
diff --git a/packages/desktop/src/renderer/components/widgets/usernameTakenModal/UsernameTakenModal.container.tsx b/packages/desktop/src/renderer/components/widgets/usernameTakenModal/UsernameTakenModal.container.tsx
new file mode 100644
index 0000000000..ef9b04a8ca
--- /dev/null
+++ b/packages/desktop/src/renderer/components/widgets/usernameTakenModal/UsernameTakenModal.container.tsx
@@ -0,0 +1,47 @@
+import { identity, users } from '@quiet/state-manager'
+import React, { useCallback, useEffect } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { useModal } from '../../../containers/hooks'
+import { ModalName } from '../../../sagas/modals/modals.types'
+import CreateUsernameComponent, { UsernameVariant } from '../../CreateUsername/CreateUsernameComponent'
+
+const UsernameTakenModalContainer = () => {
+  const dispatch = useDispatch()
+
+  const isUsernameTaken = useSelector(identity.selectors.usernameTaken)
+  const usernameTakenModal = useModal(ModalName.usernameTakenModal)
+  const registeredUsers = useSelector(users.selectors.certificatesMapping)
+  const user = useSelector(identity.selectors.currentIdentity)
+
+  const registerUsername = useCallback(
+    (nickname: string) => {
+      dispatch(
+        identity.actions.registerUsername({
+          nickname,
+          isUsernameTaken: true,
+        })
+      )
+    },
+    [dispatch]
+  )
+
+  useEffect(() => {
+    if (isUsernameTaken) {
+      usernameTakenModal.handleOpen()
+    } else {
+      usernameTakenModal.handleClose()
+    }
+  }, [isUsernameTaken])
+
+  return (
+    <CreateUsernameComponent
+      currentUsername={user?.nickname}
+      registerUsername={registerUsername}
+      variant={UsernameVariant.TAKEN}
+      registeredUsers={registeredUsers}
+      {...usernameTakenModal}
+    />
+  )
+}
+
+export default UsernameTakenModalContainer
diff --git a/packages/desktop/src/renderer/sagas/modals/modals.slice.ts b/packages/desktop/src/renderer/sagas/modals/modals.slice.ts
index 9452e8176a..fee515645f 100644
--- a/packages/desktop/src/renderer/sagas/modals/modals.slice.ts
+++ b/packages/desktop/src/renderer/sagas/modals/modals.slice.ts
@@ -35,7 +35,9 @@ export class ModalsInitialState {
   [ModalName.loadingPanel] = { open: true, args: {} }; // Loading modal is open by default and closes on websocket connection
   [ModalName.channelCreationModal] = { open: false, args: {} };
   [ModalName.unregisteredUsernameModal] = { open: false, args: {} };
-  [ModalName.duplicatedUsernameModal] = { open: false, args: {} }
+  [ModalName.duplicatedUsernameModal] = { open: false, args: {} };
+  [ModalName.usernameTakenModal] = { open: false, args: {} };
+  [ModalName.possibleImpersonationAttackModal] = { open: false, args: {} }
 }
 
 export const modalsSlice = createSlice({
diff --git a/packages/desktop/src/renderer/sagas/modals/modals.types.ts b/packages/desktop/src/renderer/sagas/modals/modals.types.ts
index 3b4c44ae71..d79e2518e1 100644
--- a/packages/desktop/src/renderer/sagas/modals/modals.types.ts
+++ b/packages/desktop/src/renderer/sagas/modals/modals.types.ts
@@ -23,4 +23,6 @@ export enum ModalName {
   channelCreationModal = 'channelCreationModal',
   duplicatedUsernameModal = 'duplicatedUsernameModal',
   unregisteredUsernameModal = 'unregisteredUsernameModal',
+  usernameTakenModal = 'usernameTakenModal',
+  possibleImpersonationAttackModal = 'possibleImpersonationAttackModal',
 }
diff --git a/packages/desktop/src/renderer/sagas/store.utils.ts b/packages/desktop/src/renderer/sagas/store.utils.ts
index d2e6aa0727..f73806eb3b 100644
--- a/packages/desktop/src/renderer/sagas/store.utils.ts
+++ b/packages/desktop/src/renderer/sagas/store.utils.ts
@@ -1,5 +1,4 @@
 import { createSelector } from '@reduxjs/toolkit'
-
 import { StoreKeys } from '../store/store.keys'
 import { AnyObject } from '../../utils/types/AnyObject.interface'
 
diff --git a/packages/desktop/src/renderer/store/handlers/app.ts b/packages/desktop/src/renderer/store/handlers/app.ts
index 3615ade723..027eff2826 100644
--- a/packages/desktop/src/renderer/store/handlers/app.ts
+++ b/packages/desktop/src/renderer/store/handlers/app.ts
@@ -1,7 +1,6 @@
 import { produce, immerable } from 'immer'
 import { createAction, handleActions } from 'redux-actions'
 import { actionTypes } from '../../../shared/static'
-
 import { ActionsType, PayloadType } from './types'
 
 export class App {
diff --git a/packages/desktop/src/rtl-tests/community.create.test.tsx b/packages/desktop/src/rtl-tests/community.create.test.tsx
index 1dc7fa73d4..cf055bfa0d 100644
--- a/packages/desktop/src/rtl-tests/community.create.test.tsx
+++ b/packages/desktop/src/rtl-tests/community.create.test.tsx
@@ -99,7 +99,6 @@ describe('User', () => {
           communityId: payload.communityId,
           network: {
             certificate: payload.permsData.certificate,
-            peers: [],
           },
         })
       }
@@ -195,7 +194,6 @@ describe('User', () => {
         "Modals/openModal",
         "Identity/registerCertificate",
         "Communities/addOwnerCertificate",
-        "Communities/storePeerList",
         "Identity/storeUserCertificate",
         "Identity/savedOwnerCertificate",
         "Communities/launchRegistrar",
diff --git a/packages/desktop/src/rtl-tests/loadingPanel.test.tsx b/packages/desktop/src/rtl-tests/loadingPanel.test.tsx
index 57b6b0cf53..5730507f97 100644
--- a/packages/desktop/src/rtl-tests/loadingPanel.test.tsx
+++ b/packages/desktop/src/rtl-tests/loadingPanel.test.tsx
@@ -168,7 +168,11 @@ describe('Loading panel', () => {
     // Assertions that we don't see Loading Pannel
     expect(screen.queryByTestId('spinnerLoader')).toBeNull()
     // 'Create username' modal should be closed after creating csr
-    store.dispatch(identity.actions.registerUsername('alice'))
+    store.dispatch(
+      identity.actions.registerUsername({
+        nickname: 'alice',
+      })
+    )
     await waitFor(() => expect(screen.queryByTestId('createUsernameModalActions')).toBeNull())
   })
 })
diff --git a/packages/desktop/src/rtl-tests/possibleImpersonationAttack.test.tsx b/packages/desktop/src/rtl-tests/possibleImpersonationAttack.test.tsx
new file mode 100644
index 0000000000..4e1a8af679
--- /dev/null
+++ b/packages/desktop/src/rtl-tests/possibleImpersonationAttack.test.tsx
@@ -0,0 +1,105 @@
+import React from 'react'
+import '@testing-library/jest-dom/extend-expect'
+import { act } from 'react-dom/test-utils'
+import { screen } from '@testing-library/dom'
+import { Task } from 'redux-saga'
+import MockedSocket from 'socket.io-mock'
+import { FactoryGirl } from 'factory-girl'
+import { ioMock } from '../shared/setupTests'
+import { renderComponent } from '../renderer/testUtils/renderComponent'
+import { prepareStore } from '../renderer/testUtils/prepareStore'
+import { getFactory, identity, communities, Community, Identity, Store, users } from '@quiet/state-manager'
+import PossibleImpersonationAttackModalContainer from '../renderer/components/widgets/possibleImpersonationAttackModal/PossibleImpersonationAttackModal.container'
+
+jest.setTimeout(20_000)
+
+jest.mock('../renderer/index', () => ({
+  clearCommunity: () => {},
+}))
+
+jest.mock('electron', () => {
+  return {
+    ipcRenderer: { on: () => {}, send: jest.fn(), sendSync: jest.fn() },
+    remote: {
+      BrowserWindow: {
+        getAllWindows: () => {
+          return [
+            {
+              show: jest.fn(),
+              isFocused: jest.fn(),
+            },
+          ]
+        },
+      },
+    },
+  }
+})
+
+describe('Possible Impersonation Attack', () => {
+  let socket: MockedSocket
+
+  let redux: {
+    store: Store
+    runSaga: (saga: any) => Task
+  }
+  let factory: FactoryGirl
+
+  let community: Community
+  let alice: Identity
+
+  beforeEach(async () => {
+    socket = new MockedSocket()
+    ioMock.mockImplementation(() => socket)
+    window.ResizeObserver = jest.fn().mockImplementation(() => ({
+      observe: jest.fn(),
+      unobserve: jest.fn(),
+      disconnect: jest.fn(),
+    }))
+
+    redux = await prepareStore({}, socket)
+    factory = await getFactory(redux.store)
+
+    community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>('Community')
+
+    alice = await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity', {
+      id: community.id,
+      nickname: 'alice',
+    })
+  })
+
+  it('Open modal when certifcates are duplicated', async () => {
+    window.HTMLElement.prototype.scrollTo = jest.fn()
+
+    renderComponent(
+      <>
+        <PossibleImpersonationAttackModalContainer />
+      </>,
+      redux.store
+    )
+
+    const cert1 =
+      'MIIDeDCCAx6gAwIBAgIGAYr6Jw3hMAoGCCqGSM49BAMCMA8xDTALBgNVBAMTBGZyZmQwHhcNMjMxMDA0MTAwNjE4WhcNMzAwMTMxMjMwMDAwWjBJMUcwRQYDVQQDEz5tenhydWhyNWJzdGt3dmp3eWJnZ2Y2M2Jma2dreWw0aWs0bG5lanN1YnFlaG9td3Vpbm43d3JxZC5vbmlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGcKhXLUNjkS9+xd0hYfJBOA7bXB5LwZojhzgBQps3SW/CSR6ABiAuirdP0x/byxTXSkZY23lBkvc5CqMjWe3lWjggIqMIICJjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIAgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwggFHBgkqhkiG9w0BCQwEggE4BIIBNAXhwXxmLy7Gg5uonlWXiqRUimGLj2cPbAoK9DnKHkcohqdLvEzyz6rM7KBewO068fag0d/PR0uh37Oyb7d/JAbBjhJmf8wOl2HfLTThPEEH8isy3bxHXx4Ir5prVVk1zx8UiXtPAu6gK41FY5Oin6SpV07MBewqQGcbCovcbBSwkp6EXmLXPOGgmpFlQf5CNGIs3YqPD+Ll1vn8Lq5QIGCa210Pq/T65mrPsXVAw2vJO6DFRIAGrAF5VxDS8G2dSwnDnje+bD2NO8qlfwFdO3bkDeheOqZXCSxlPA6q1bY34qYR2zrwSiQCjRiCQjifRCmF2Jg4ojzLGUL0pKdvi+8fDQXollmazh5boJWN9GRy+1sDLTk01cW2kF7esew5PlDi8kX0v2hY+XsR5eQga1j3MkXkMBgGCisGAQQBg4wbAgEEChMIdXNlcm5hbWUwPQYJKwYBAgEPAwEBBDATLlFtUHF6THFheFk1UmI4VlpjM1VuZmlXZXRxVDZKWkp6SnRjWVFXNmhXTENvRXIwSQYDVR0RBEIwQII+bXp4cnVocjVic3Rrd3Zqd3liZ2dmNjNiZmtna3lsNGlrNGxuZWpzdWJxZWhvbXd1aW5uN3dycWQub25pb24wCgYIKoZIzj0EAwIDSAAwRQIhAJx4YX8KtOA4WGAWzW0M7FvuoblNOb370521GsfuHfbMAiBEYQ4l074oUEF2DTVK1agJlhMR5USRxav5xEpx2ujMeA=='
+
+    const cert2 =
+      'MIIDdzCCAx2gAwIBAgIGAYr6JZFvMAoGCCqGSM49BAMCMA4xDDAKBgNVBAMTA2RldjAeFw0yMzEwMDQxMDA0NDBaFw0zMDAxMzEyMzAwMDBaMEkxRzBFBgNVBAMTPnRvaWwydGhwamNwejVxNjNzNnZidXB4eHRkbjJ3NGxpY2x5NXlzcmN5cnNyanZieGhuZW5qZHlkLm9uaW9uMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5mAo+7fqZimgOwtzVHR/sWl/8n4bXWMtk2PrQ3Eri1a05Y3upQR07UG72O3aH30QSn8upmPqUjsPtbyhtEMXi6OCAiowggImMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgCAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATCCAUcGCSqGSIb3DQEJDASCATgEggE0B/mkyxZeflBGdsVcbR1hHYOhCv8Jlb6FDAmV1HFtHzEn3WNi96hBpW/GWMnfNR5Wv0Uofzf+A51svouXtFUGEt8aELjqgHMnrwkRR5BHN3XhvVjcYpX9uLf9HcbBdMpgdcrFKLTblTlMcNGczZVAjTt5O6x6MjxlzSHlDnBt8owNPap9xwn0SFgNHfxfg4XXUml1U96G+Ayzgjmu5Hy+A+JZcqSWdK3xyBzf9g9JhSV5tit7W+xzHvD+FFc2434dbYKbJxthxXGQp3mfZz8ILaxtGEeXOewNTXTjvybv9da2ZXofj3ODAdeNZzhy4NQ2ptUU4hW8QFrpr44vJRXeT7JgTpIJaZecPD51UQ3mfqOffYzthM6zhiU5t7tiVo86a4nlVgNJLzGcVJ3aObAnT6M2dnQwGAYKKwYBBAGDjBsCAQQKEwh1c2VybmFtZTA9BgkrBgECAQ8DAQEEMBMuUW1RS0Rqd2tVTjZYRUZQaVA5V0tBaUZjUXNZQlhIWEtzcHhHNlZ1WU1ZVkFHRzBJBgNVHREEQjBAgj50b2lsMnRocGpjcHo1cTYzczZ2YnVweHh0ZG4ydzRsaWNseTV5c3JjeXJzcmp2YnhobmVuamR5ZC5vbmlvbjAKBggqhkjOPQQDAgNIADBFAiBFaaJYuacbj60wEU9uur7lMoWwhf+uavBnKdoKg93LIQIhAMrd3PN6rggZ4gRNNzhno5yrwTm3/B0ZHaG+zGuO7J8c'
+
+    redux.store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: cert1,
+      })
+    )
+
+    redux.store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: cert2,
+      })
+    )
+    await act(async () => {})
+
+    const modal = screen.getByTestId('possible-impersonation-attack-modal-component')
+    expect(modal).toBeVisible()
+
+    const button = screen.getByTestId('unregistered-button')
+    expect(button).toBeVisible()
+  })
+})
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index 83f2ec9f0c..065458591c 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/e2e-tests@1.8.2...e2e-tests@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/e2e-tests@2.0.1-alpha.0...e2e-tests@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/e2e-tests@2.0.0-alpha.4...e2e-tests@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/e2e-tests@1.8.2...e2e-tests@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package e2e-tests
diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json
index 16c416f068..11b7aa1578 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2e-tests",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 7f1667ca7b..d595cfc57b 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "For running end to end tests we use  Selenium WebDriver (https://www.selenium.dev/documentation/webdriver/) with Electron ChromeDriver (https://www.npmjs.com/package/electron-chromedriver) in Jest",
   "main": "index.js",
   "private": true,
@@ -11,11 +11,12 @@
     "lint-ci": "eslint --ext .js,.ts ./src/",
     "prettier:write": "prettier --write .",
     "prettier:check": "prettier --check .",
-    "test": "jest --runInBand --detectOpenHandles --forceExit",
+    "test": "cross-env TEST_MODE=true jest --runInBand --detectOpenHandles --forceExit",
+    "test:prod": "jest --runInBand --detectOpenHandles --forceExit",
     "test:watch": "jest --watchAll"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@types/jest": "^29.2.6",
     "@types/selenium-webdriver": "^4.1.10",
     "babel-jest": "^29.3.1",
@@ -23,10 +24,10 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/common": "^2.0.0-alpha.18",
-    "@quiet/logger": "^2.0.0-alpha.18",
-    "@quiet/types": "^2.0.0-alpha.18",
-    "backend-bundle": "^2.0.0-alpha.18",
+    "@quiet/common": "^2.0.1-alpha.2",
+    "@quiet/logger": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.2",
+    "backend-bundle": "^2.0.1-alpha.2",
     "cross-env": "^5.2.0",
     "electron-chromedriver": "22.0.0",
     "get-port": "^5.1.1",
diff --git a/packages/e2e-tests/src/selectors.ts b/packages/e2e-tests/src/selectors.ts
index 41c64ff047..dad7cd0bd9 100644
--- a/packages/e2e-tests/src/selectors.ts
+++ b/packages/e2e-tests/src/selectors.ts
@@ -4,6 +4,7 @@ import { BuildSetup, type BuildSetupInit } from './utils'
 export class App {
   thenableWebDriver?: ThenableWebDriver
   buildSetup: BuildSetup
+  isOpened: boolean
   constructor(buildSetupConfig?: BuildSetupInit) {
     this.buildSetup = new BuildSetup({ ...buildSetupConfig })
   }
@@ -16,13 +17,19 @@ export class App {
   }
 
   async open() {
+    console.log('Opening the app', this.buildSetup.dataDir)
     this.buildSetup.resetDriver()
     await this.buildSetup.createChromeDriver()
+    this.isOpened = true
     this.thenableWebDriver = this.buildSetup.getDriver()
     await this.driver.getSession()
+    const debugModal = new DebugModeModal(this.driver)
+    await debugModal.close()
   }
 
   async close(options?: { forceSaveState?: boolean }) {
+    if (!this.isOpened) return
+    console.log('Closing the app', this.buildSetup.dataDir)
     if (options?.forceSaveState) {
       await this.saveState() // Selenium creates community and closes app so fast that redux state may not be saved properly
       await this.waitForSavedState()
@@ -33,6 +40,8 @@ export class App {
       this.buildSetup.killNine()
       await new Promise<void>(resolve => setTimeout(() => resolve(), 2000))
     }
+    this.isOpened = false
+    console.log('App closed', this.buildSetup.dataDir)
   }
 
   get saveStateButton() {
@@ -59,12 +68,6 @@ export class StartingLoadingPanel {
   get element() {
     return this.driver.wait(until.elementLocated(By.xpath('//div[@data-testid="startingPanelComponent"]')))
   }
-  // get element() {
-  //   return this.driver.wait(until.elementLocated(By.xpath(`//span[text()="${this.text}"]`)))
-  // }
-  // get title() {
-  //   return this.driver.findElement(By.xpath(`//span[text()="${this.text}"]`))
-  // }
 }
 
 export class WarningModal {
@@ -227,6 +230,19 @@ export class Channel {
     return await messagesGroup.findElement(By.xpath('//p[@data-testid="/messagesGroupContent-/"]'))
   }
 
+  async waitForUserMessage(username: string, messageContent: string) {
+    console.log(`Waiting for user "${username}" message "${messageContent}"`)
+    return this.driver.wait(async () => {
+      const messages = await this.getUserMessages(username)
+      const hasMessage = messages.find(async msg => {
+        const messageText = await msg.getText()
+        console.log(`got message "${messageText}"`)
+        return messageText.includes(messageContent)
+      })
+      return hasMessage
+    })
+  }
+
   get getAllMessages() {
     return this.driver.wait(until.elementsLocated(By.xpath('//*[contains(@data-testid, "userMessages-")]')))
   }
@@ -256,6 +272,26 @@ export class Channel {
     )
   }
 
+  async waitForLabel(username: string, label: string) {
+    console.log(`Waiting for user's "${username}" label "${label}" label`)
+    await this.driver.wait(async () => {
+      const labels = await this.driver.findElements(By.xpath(`//*[contains(@data-testid, "userLabel-${username}")]`))
+      const properLabels = labels.filter(async labelElement => {
+        const labelText = await labelElement.getText()
+        return labelText === label
+      })
+      return properLabels.length > 0
+    })
+  }
+
+  async waitForLabelsNotPresent(username: string) {
+    console.log(`Waiting for user's "${username}" label to not be present`)
+    await this.driver.wait(async () => {
+      const labels = await this.driver.findElements(By.xpath(`//*[contains(@data-testid, "userLabel-${username}")]`))
+      return labels.length === 0
+    })
+  }
+
   async getMessage(text: string) {
     return await this.driver.wait(until.elementLocated(By.xpath(`//span[contains(text(),"${text}")]`)))
   }
@@ -375,18 +411,27 @@ export class DebugModeModal {
   }
 
   get element() {
-    return this.driver.wait(until.elementLocated(By.xpath("//h3[text()='App is running in debug mode']")))
+    return this.driver.wait(until.elementLocated(By.xpath("//h3[text()='App is running in debug mode']")), 5000)
   }
 
   get button() {
-    return this.driver.wait(until.elementLocated(By.xpath("//button[text()='Understand']")))
+    return this.driver.wait(until.elementLocated(By.xpath("//button[text()='Understand']")), 5000)
   }
 
   async close() {
-    console.log('Closing debug modal')
-    await this.element.isDisplayed()
-    const button = await this.button
-    console.log('Debug modal title is displayed')
+    if (!process.env.TEST_MODE) return
+    let button
+    try {
+      console.log('Closing debug modal')
+      await this.element.isDisplayed()
+      console.log('Debug modal title is displayed')
+      button = await this.button
+      console.log('Debug modal button is displayed')
+    } catch (e) {
+      console.log('Debug modal might have been covered by "join community" modal', e.message)
+      return
+    }
+
     await button.isDisplayed()
     console.log('Button is displayed')
     await button.click()
diff --git a/packages/e2e-tests/src/tests/invitationLink.test.ts b/packages/e2e-tests/src/tests/invitationLink.test.ts
index 0b4e917019..e43f845071 100644
--- a/packages/e2e-tests/src/tests/invitationLink.test.ts
+++ b/packages/e2e-tests/src/tests/invitationLink.test.ts
@@ -44,14 +44,6 @@ describe('New user joins using invitation link while having app opened', () => {
       await ownerApp.open()
     })
 
-    if (process.env.TEST_MODE) {
-      it('Owner closes debug modal', async () => {
-        console.log('Invitation Link', 2)
-        const debugModal = new DebugModeModal(ownerApp.driver)
-        await debugModal.close()
-      })
-    }
-
     it('JoinCommunityModal - owner switches to create community', async () => {
       console.log('Invitation Link', 4)
       const joinModal = new JoinCommunityModal(ownerApp.driver)
@@ -121,13 +113,6 @@ describe('New user joins using invitation link while having app opened', () => {
       console.log('Guest opens app')
       await guestApp.open()
     })
-    if (process.env.TEST_MODE) {
-      it('Close debug modal', async () => {
-        console.log('Invitation Link', 12)
-        const debugModal = new DebugModeModal(guestApp.driver)
-        await debugModal.close()
-      })
-    }
 
     it.skip('Guest clicks invitation link with invalid invitation code', async () => {
       // Fix when modals ordering is fixed (joining modal hiddes warning modal)
diff --git a/packages/e2e-tests/src/tests/multipleClients.test.ts b/packages/e2e-tests/src/tests/multipleClients.test.ts
new file mode 100644
index 0000000000..9adf41a272
--- /dev/null
+++ b/packages/e2e-tests/src/tests/multipleClients.test.ts
@@ -0,0 +1,438 @@
+import {
+  App,
+  Channel,
+  ChannelContextMenu,
+  CreateCommunityModal,
+  DebugModeModal,
+  JoinCommunityModal,
+  RegisterUsernameModal,
+  Sidebar,
+} from '../selectors'
+import logger from '../logger'
+const log = logger('ManyClients')
+
+interface UserTestData {
+  username: string
+  app: App
+  messages: string[]
+}
+
+jest.setTimeout(900000)
+describe('Multiple Clients', () => {
+  let generalChannelOwner: Channel
+  let generalChannelUser1: Channel
+  let generalChannelUser3: Channel
+
+  let secondChannelUser1: Channel
+
+  let channelContextMenuOwner: ChannelContextMenu
+
+  let invitationCode: string
+
+  let sidebarOwner: Sidebar
+  let sidebarUser1: Sidebar
+
+  let users: Record<string, UserTestData>
+
+  const communityName = 'testcommunity'
+  const displayedCommunityName = 'Testcommunity'
+  const newChannelName = 'mid-night-club'
+
+  const sleep = async (time = 1000) => {
+    await new Promise<void>(resolve =>
+      setTimeout(() => {
+        resolve()
+      }, time)
+    )
+  }
+
+  beforeAll(async () => {
+    const commonApp = new App()
+    users = {
+      owner: {
+        username: 'owner',
+        messages: ['Hi', 'Hello', 'After guest left the app'],
+        app: new App(),
+      },
+      user1: {
+        username: 'user-joining-1',
+        messages: ['Nice to meet you all'],
+        app: commonApp,
+      },
+      user2: {
+        username: 'user-joining-1-1',
+        messages: ['Nice to meet you again'],
+        app: commonApp,
+      },
+      user3: {
+        username: 'user-joining-2',
+        messages: ['Hi everyone'],
+        app: new App(),
+      },
+    }
+  })
+
+  afterAll(async () => {
+    for (const user of Object.values(users)) {
+      await user.app.close()
+    }
+  })
+
+  beforeEach(async () => {
+    await sleep(1000)
+  })
+
+  describe('Stages:', () => {
+    it('Owner opens the app', async () => {
+      await users.owner.app.open()
+    })
+
+    it('Owner sees "join community" modal and switches to "create community" modal', async () => {
+      const joinModal = new JoinCommunityModal(users.owner.app.driver)
+      const isJoinModal = await joinModal.element.isDisplayed()
+      expect(isJoinModal).toBeTruthy()
+      await joinModal.switchToCreateCommunity()
+    })
+    it('Owner submits valid community name', async () => {
+      const createModal = new CreateCommunityModal(users.owner.app.driver)
+      const isCreateModal = await createModal.element.isDisplayed()
+      expect(isCreateModal).toBeTruthy()
+      await createModal.typeCommunityName(communityName)
+      await createModal.submit()
+    })
+    it('Owner sees "register username" modal and submits valid username', async () => {
+      const registerModal = new RegisterUsernameModal(users.owner.app.driver)
+      const isRegisterModal = await registerModal.element.isDisplayed()
+      expect(isRegisterModal).toBeTruthy()
+      await registerModal.typeUsername(users.owner.username)
+      await registerModal.submit()
+    })
+    it('Owner registers successfully and sees general channel', async () => {
+      generalChannelOwner = new Channel(users.owner.app.driver, 'general')
+      const isGeneralChannel = await generalChannelOwner.element.isDisplayed()
+      const generalChannelText = await generalChannelOwner.element.getText()
+      expect(isGeneralChannel).toBeTruthy()
+      expect(generalChannelText).toEqual('# general')
+    })
+    it('Owner sends a message', async () => {
+      const isMessageInput = await generalChannelOwner.messageInput.isDisplayed()
+      expect(isMessageInput).toBeTruthy()
+      await generalChannelOwner.sendMessage(users.owner.messages[0])
+    })
+    it("Owner's message is visible on channel", async () => {
+      const messages = await generalChannelOwner.getUserMessages(users.owner.username)
+      const text = await messages[1].getText()
+      expect(text).toEqual(users.owner.messages[0])
+    })
+    it('Owner opens the settings tab and gets an invitation code', async () => {
+      const settingsModal = await new Sidebar(users.owner.app.driver).openSettings()
+      const isSettingsModal = await settingsModal.element.isDisplayed()
+      expect(isSettingsModal).toBeTruthy()
+      await sleep(2000)
+      await settingsModal.switchTab('invite') // TODO: Fix - the invite tab should be default for the owner
+      await sleep(2000)
+      const invitationCodeElement = await settingsModal.invitationCode()
+      await sleep(2000)
+      invitationCode = await invitationCodeElement.getText()
+      await sleep(2000)
+      console.log({ invitationCode })
+      expect(invitationCode).not.toBeUndefined()
+      log('Received invitation code:', invitationCode)
+      await settingsModal.close()
+    })
+
+    it('First user opens the app', async () => {
+      console.log('Second client')
+      await users.user1.app.open()
+    })
+
+    it('First user submits invitation code received from owner', async () => {
+      console.log('new user - 3')
+      const joinCommunityModal = new JoinCommunityModal(users.user1.app.driver)
+      const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
+      expect(isJoinCommunityModal).toBeTruthy()
+      console.log({ invitationCode })
+      await joinCommunityModal.typeCommunityCode(invitationCode)
+      await joinCommunityModal.submit()
+    })
+
+    it('First user submits valid username', async () => {
+      console.log('new user - 5')
+      const registerModal = new RegisterUsernameModal(users.user1.app.driver)
+      const isRegisterModal = await registerModal.element.isDisplayed()
+      expect(isRegisterModal).toBeTruthy()
+      await registerModal.clearInput()
+      await registerModal.typeUsername(users.user1.username)
+      await registerModal.submit()
+    })
+
+    it('First user joins successfully sees general channel and sends a message', async () => {
+      console.log('new user - 7')
+      generalChannelUser1 = new Channel(users.user1.app.driver, 'general')
+      await generalChannelUser1.element.isDisplayed()
+      const isMessageInput2 = await generalChannelUser1.messageInput.isDisplayed()
+      expect(isMessageInput2).toBeTruthy()
+      console.log('FETCHING CHANNEL MESSAGES!')
+      await new Promise<void>(resolve =>
+        setTimeout(() => {
+          resolve()
+        }, 15000)
+      )
+      await generalChannelUser1.sendMessage(users.user1.messages[0])
+    })
+    it("First user's sent message is visible in a channel", async () => {
+      const messages2 = await generalChannelUser1.getUserMessages(users.user1.username)
+      const messages1 = await generalChannelUser1.getUserMessages(users.owner.username)
+      console.log({ messages1, messages2 })
+      const text2 = await messages2[0].getText()
+      expect(text2).toEqual(users.user1.messages[0])
+    })
+    it('First user opens the settings tab and copies updated invitation code', async () => {
+      const settingsModal = await new Sidebar(users.user1.app.driver).openSettings()
+      const isSettingsModal = await settingsModal.element.isDisplayed()
+      expect(isSettingsModal).toBeTruthy()
+      await sleep(2000)
+      await settingsModal.switchTab('invite')
+      await sleep(2000)
+      const invitationCodeElement = await settingsModal.invitationCode()
+      await sleep(2000)
+      invitationCode = await invitationCodeElement.getText()
+      await sleep(2000)
+      console.log(`${invitationCode} copied from non owner`)
+      expect(invitationCode).not.toBeUndefined()
+      await settingsModal.close()
+    })
+
+    it('Owner goes offline', async () => {
+      await users.owner.app.close()
+    })
+
+    it('Second user opens the app', async () => {
+      console.log('Third client')
+      await users.user3.app.open()
+      const debugModal = new DebugModeModal(users.user3.app.driver)
+      await debugModal.close()
+    })
+
+    it('Second user starts to join when owner is offline', async () => {
+      const joinCommunityModal = new JoinCommunityModal(users.user3.app.driver)
+      const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
+      expect(isJoinCommunityModal).toBeTruthy()
+      console.log({ invitationCode })
+      await joinCommunityModal.typeCommunityCode(invitationCode)
+      await joinCommunityModal.submit()
+    })
+
+    it('Second user submits valid, not-duplicated username', async () => {
+      console.log('nereeew user - 5')
+      const registerModal = new RegisterUsernameModal(users.user3.app.driver)
+      const isRegisterModal = await registerModal.element.isDisplayed()
+      expect(isRegisterModal).toBeTruthy()
+      await registerModal.clearInput()
+      await registerModal.typeUsername(users.user3.username)
+      await registerModal.submit()
+    })
+
+    it('Second user sees general channel', async () => {
+      console.log('new user - 7')
+      generalChannelUser3 = new Channel(users.user3.app.driver, 'general')
+      await generalChannelUser3.element.isDisplayed()
+      const isMessageInput = await generalChannelUser3.messageInput.isDisplayed()
+      expect(isMessageInput).toBeTruthy()
+    })
+
+    it('Second user can send a message, they see their message tagged as "unregistered"', async () => {
+      console.log('Second guest FETCHING CHANNEL MESSAGES!')
+      await new Promise<void>(resolve =>
+        setTimeout(() => {
+          resolve()
+        }, 15000)
+      )
+      await generalChannelUser3.sendMessage(users.user3.messages[0])
+      generalChannelUser3 = new Channel(users.user3.app.driver, 'general')
+      await generalChannelUser3.waitForLabel(users.user3.username, 'Unregistered')
+    })
+
+    it('First user sees that unregistered user\'s messages are marked as "unregistered"', async () => {
+      await generalChannelUser1.waitForLabel(users.user3.username, 'Unregistered')
+    })
+
+    it('Owner goes back online', async () => {
+      await users.owner.app.open()
+      const debugModal = new DebugModeModal(users.owner.app.driver)
+      await debugModal.close()
+    })
+
+    it('Second user receives certificate, they can see confirmation that they registered', async () => {
+      await generalChannelUser3.waitForUserMessage(
+        users.owner.username,
+        `@${users.user3.username} has joined ${displayedCommunityName}!`
+      )
+    })
+
+    it('"Unregistered" label is removed from second user\'s messages', async () => {
+      generalChannelOwner = new Channel(users.owner.app.driver, 'general')
+      await generalChannelOwner.waitForLabelsNotPresent(users.user3.username)
+    })
+
+    it('Channel creation - Owner creates second channel', async () => {
+      sidebarOwner = new Sidebar(users.owner.app.driver)
+      await sidebarOwner.addNewChannel(newChannelName)
+      await sidebarOwner.switchChannel(newChannelName)
+      const channels = await sidebarOwner.getChannelList()
+      expect(channels.length).toEqual(2)
+    })
+    it('Channel creation - Owner sends message in second channel', async () => {
+      const newChannel = new Channel(users.owner.app.driver, newChannelName)
+      const isMessageInput = await newChannel.messageInput.isDisplayed()
+      expect(isMessageInput).toBeTruthy()
+      await newChannel.sendMessage(users.owner.messages[1])
+    })
+    it('Channel creation - User reads message in second channel', async () => {
+      sidebarUser1 = new Sidebar(users.user1.app.driver)
+      await sidebarUser1.switchChannel(newChannelName)
+      secondChannelUser1 = new Channel(users.user1.app.driver, newChannelName)
+      await new Promise<void>(resolve =>
+        setTimeout(() => {
+          resolve()
+        }, 2000)
+      )
+      await secondChannelUser1.waitForUserMessage(users.owner.username, users.owner.messages[1])
+    })
+    it('Channel deletion - Owner deletes second channel', async () => {
+      channelContextMenuOwner = new ChannelContextMenu(users.owner.app.driver)
+      await channelContextMenuOwner.openMenu()
+      await channelContextMenuOwner.openDeletionChannelModal()
+      await channelContextMenuOwner.deleteChannel()
+      const channels = await sidebarOwner.getChannelList()
+      expect(channels.length).toEqual(1)
+    })
+    it('Channel deletion - User sees info about channel deletion in general channel', async () => {
+      await sleep(5000)
+      await generalChannelUser1.waitForUserMessage(
+        users.owner.username,
+        `@${users.owner.username} deleted #${newChannelName}`
+      )
+    })
+    it('Channel deletion - User can create channel with the same name and is fresh channel', async () => {
+      await sidebarUser1.addNewChannel(newChannelName)
+      await sidebarUser1.switchChannel(newChannelName)
+      const messages = await secondChannelUser1.getUserMessages(users.user1.username)
+      expect(messages.length).toEqual(1)
+      await new Promise<void>(resolve =>
+        setTimeout(() => {
+          resolve()
+        }, 2000)
+      )
+      const channels = await sidebarOwner.getChannelList()
+      expect(channels.length).toEqual(2)
+    })
+    // End of tests for Windows
+    if (process.platform !== 'win32') {
+      it('Leave community', async () => {
+        console.log('TEST 2')
+        const settingsModal = await new Sidebar(users.user1.app.driver).openSettings()
+        const isSettingsModal = await settingsModal.element.isDisplayed()
+        expect(isSettingsModal).toBeTruthy()
+        await settingsModal.openLeaveCommunityModal()
+        await settingsModal.leaveCommunityButton()
+      })
+      // Delete general channel while guest is absent
+      it('Channel deletion - Owner recreates general channel', async () => {
+        console.log('TEST 3')
+        await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
+        const isGeneralChannel = await generalChannelOwner.messageInput.isDisplayed()
+        expect(isGeneralChannel).toBeTruthy()
+        await channelContextMenuOwner.openMenu()
+        await channelContextMenuOwner.openDeletionChannelModal()
+        await channelContextMenuOwner.deleteChannel()
+        const channels = await sidebarOwner.getChannelList()
+        expect(channels.length).toEqual(2)
+      })
+
+      it('Leave community - Guest re-join to community successfully', async () => {
+        console.log('TEST 4')
+        const debugModal = new DebugModeModal(users.user1.app.driver)
+        await debugModal.close()
+        const joinCommunityModal = new JoinCommunityModal(users.user1.app.driver)
+        const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
+        expect(isJoinCommunityModal).toBeTruthy()
+        await joinCommunityModal.typeCommunityCode(invitationCode)
+        await joinCommunityModal.submit()
+      })
+      it('Leave community - Guest registers new username', async () => {
+        console.log('TEST 5')
+        const registerModal2 = new RegisterUsernameModal(users.user1.app.driver)
+        const isRegisterModal2 = await registerModal2.element.isDisplayed()
+        expect(isRegisterModal2).toBeTruthy()
+        await registerModal2.typeUsername(users.user2.username)
+        await registerModal2.submit()
+      })
+
+      // Check correct channels replication
+      it('Channel deletion - User sees information about recreation general channel and see correct amount of messages', async () => {
+        console.log('TEST 6')
+        generalChannelUser1 = new Channel(users.user1.app.driver, 'general')
+        await generalChannelUser1.element.isDisplayed()
+        await new Promise<void>(resolve =>
+          setTimeout(() => {
+            resolve()
+          }, 10000)
+        )
+
+        await generalChannelUser1.waitForUserMessage(
+          users.owner.username,
+          `@${users.owner.username} deleted all messages in #general`
+        )
+        await generalChannelUser1.waitForUserMessage(
+          users.owner.username,
+          `@${users.user2.username} has joined Testcommunity! 🎉`
+        )
+      })
+
+      it('Leave community - Guest sends a message after rejoining community as a new user', async () => {
+        console.log('TEST 7')
+        generalChannelUser1 = new Channel(users.user1.app.driver, 'general')
+        await generalChannelUser1.element.isDisplayed()
+        const isMessageInput2 = await generalChannelUser1.messageInput.isDisplayed()
+        expect(isMessageInput2).toBeTruthy()
+        await new Promise<void>(resolve =>
+          setTimeout(() => {
+            resolve()
+          }, 5000)
+        )
+        await generalChannelUser1.sendMessage(users.user2.messages[0])
+      })
+      it('Leave community - Sent message is visible in a channel', async () => {
+        console.log('TEST 8')
+        await generalChannelUser1.waitForUserMessage(users.user2.username, users.user2.messages[0])
+      })
+      it('Owner closes app', async () => {
+        await users.owner.app.close({ forceSaveState: true })
+        await new Promise<void>(resolve => setTimeout(() => resolve(), 20000))
+      })
+
+      it('Guest closes app', async () => {
+        console.log('TEST 9')
+        await users.user1.app?.close()
+      })
+
+      it('Owner re-opens app', async () => {
+        await users.owner.app?.open()
+        await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
+      })
+
+      it('Guest closes app - Owner sends another message after guest left the app', async () => {
+        console.log('TEST 10')
+        generalChannelOwner = new Channel(users.owner.app.driver, 'general')
+        const isMessageInput = await generalChannelOwner.messageInput.isDisplayed()
+        expect(isMessageInput).toBeTruthy()
+        await generalChannelOwner.sendMessage(users.owner.messages[2])
+      })
+      it('Guest closes app - Check if message is visible for owner', async () => {
+        console.log('TEST 11')
+        await generalChannelOwner.waitForUserMessage(users.owner.username, users.owner.messages[2])
+      })
+    }
+  })
+})
diff --git a/packages/e2e-tests/src/tests/oneClient.test.ts b/packages/e2e-tests/src/tests/oneClient.test.ts
index ce774dcc4e..090f268708 100644
--- a/packages/e2e-tests/src/tests/oneClient.test.ts
+++ b/packages/e2e-tests/src/tests/oneClient.test.ts
@@ -26,13 +26,6 @@ describe('One Client', () => {
     await app.close()
   })
   describe('User opens app for the first time', () => {
-    if (process.env.TEST_MODE) {
-      it('Close debug modal', async () => {
-        const debugModal = new DebugModeModal(app.driver)
-        await debugModal.close()
-      })
-    }
-
     it('Get opened app process data', () => {
       const processData = app.buildSetup.getProcessData()
       dataDirPath = processData.dataDirPath
@@ -110,13 +103,6 @@ describe('One Client', () => {
         await app.open()
       })
 
-      if (process.env.TEST_MODE) {
-        it('Close debug modal', async () => {
-          const debugModal = new DebugModeModal(app.driver)
-          await debugModal.close()
-        })
-      }
-
       it('User sees "general channel" page', async () => {
         const generalChannel = new Channel(app.driver, 'general')
         const isGeneralChannel = await generalChannel.element.isDisplayed()
diff --git a/packages/e2e-tests/src/tests/twoClients.test.ts b/packages/e2e-tests/src/tests/twoClients.test.ts
deleted file mode 100644
index 463f585ef3..0000000000
--- a/packages/e2e-tests/src/tests/twoClients.test.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-import {
-  App,
-  Channel,
-  ChannelContextMenu,
-  CreateCommunityModal,
-  DebugModeModal,
-  JoinCommunityModal,
-  JoiningLoadingPanel,
-  RegisterUsernameModal,
-  Sidebar,
-} from '../selectors'
-import logger from '../logger'
-const log = logger('Two Clients:')
-
-jest.setTimeout(900000)
-describe('Two Clients', () => {
-  let ownerApp: App
-  let guestApp: App
-
-  let registerModal2: RegisterUsernameModal
-
-  let generalChannel: Channel
-  let generalChannel2: Channel
-
-  let secondChannel: Channel
-  let secondChannel2: Channel
-
-  let channelContextMenu: ChannelContextMenu
-
-  let invitationCode: string
-
-  let sidebar: Sidebar
-  let sidebar2: Sidebar
-
-  const communityName = 'testcommunity'
-  const ownerUsername = 'bob'
-  const ownerMessages = ['Hi', 'Hello', 'After guest leave app']
-  const joiningUserUsername = 'alice-joining'
-  const joiningUserUsername2 = 'alice2'
-  const joiningUserMessages = ['Nice to meet you all', 'Nice to meet you again']
-  const newChannelName = 'mid-night-club'
-
-  const sleep = async (time = 1000) =>
-    await new Promise<void>(resolve =>
-      setTimeout(() => {
-        resolve()
-      }, time)
-    )
-
-  beforeAll(async () => {
-    ownerApp = new App()
-  })
-
-  afterAll(async () => {
-    await ownerApp?.close()
-  })
-
-  beforeEach(async () => {
-    await sleep(1000)
-  })
-
-  describe('Stages:', () => {
-    it('Owner opens the app', async () => {
-      await ownerApp.open()
-    })
-
-    if (process.env.TEST_MODE) {
-      it('Close debug modal', async () => {
-        const debugModal = new DebugModeModal(ownerApp.driver)
-        await debugModal.close()
-      })
-    }
-
-    it('JoinCommunityModal - owner switch to create community', async () => {
-      const joinModal = new JoinCommunityModal(ownerApp.driver)
-      const isJoinModal = await joinModal.element.isDisplayed()
-      expect(isJoinModal).toBeTruthy()
-      await joinModal.switchToCreateCommunity()
-    })
-    it('CreateCommunityModal - owner create his community', async () => {
-      const createModal = new CreateCommunityModal(ownerApp.driver)
-      const isCreateModal = await createModal.element.isDisplayed()
-      expect(isCreateModal).toBeTruthy()
-      await createModal.typeCommunityName(communityName)
-      await createModal.submit()
-    })
-    it('RegisterUsernameModal - owner has registered', async () => {
-      const registerModal = new RegisterUsernameModal(ownerApp.driver)
-      const isRegisterModal = await registerModal.element.isDisplayed()
-      expect(isRegisterModal).toBeTruthy()
-      await registerModal.typeUsername(ownerUsername)
-      await registerModal.submit()
-    })
-    it('Connecting to peers modal', async () => {
-      const loadingPanelCommunity = new JoiningLoadingPanel(ownerApp.driver)
-      const isLoadingPanelCommunity = await loadingPanelCommunity.element.isDisplayed()
-      expect(isLoadingPanelCommunity).toBeTruthy()
-    })
-    it('General channel check', async () => {
-      generalChannel = new Channel(ownerApp.driver, 'general')
-      const isGeneralChannel = await generalChannel.element.isDisplayed()
-      const generalChannelText = await generalChannel.element.getText()
-      expect(isGeneralChannel).toBeTruthy()
-      expect(generalChannelText).toEqual('# general')
-    })
-    it('Send message', async () => {
-      const isMessageInput = await generalChannel.messageInput.isDisplayed()
-      expect(isMessageInput).toBeTruthy()
-      await generalChannel.sendMessage(ownerMessages[0])
-    })
-    it('Visible message', async () => {
-      const messages = await generalChannel.getUserMessages(ownerUsername)
-      const text = await messages[1].getText()
-      expect(text).toEqual(ownerMessages[0])
-    })
-    it('Opens the settings tab and gets an invitation code', async () => {
-      const settingsModal = await new Sidebar(ownerApp.driver).openSettings()
-      const isSettingsModal = await settingsModal.element.isDisplayed()
-      expect(isSettingsModal).toBeTruthy()
-      await sleep(2000)
-      await settingsModal.switchTab('invite') // TODO: Fix - the invite tab should be default for the owner
-      await sleep(2000)
-      const invitationCodeElement = await settingsModal.invitationCode()
-      await sleep(2000)
-      invitationCode = await invitationCodeElement.getText()
-      await sleep(2000)
-      console.log({ invitationCode })
-      expect(invitationCode).not.toBeUndefined()
-      log('Received invitation code:', invitationCode)
-      await settingsModal.close()
-    })
-
-    it('Guest setup', async () => {
-      console.log('Second client')
-      guestApp = new App()
-      await guestApp.open()
-    })
-    if (process.env.TEST_MODE) {
-      it('Close debug modal', async () => {
-        const debugModal = new DebugModeModal(guestApp.driver)
-        await debugModal.close()
-      })
-    }
-
-    it('Guest joins the new community successfully', async () => {
-      console.log('new user - 3')
-      const joinCommunityModal = new JoinCommunityModal(guestApp.driver)
-      const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
-      expect(isJoinCommunityModal).toBeTruthy()
-      console.log({ invitationCode })
-      await joinCommunityModal.typeCommunityCode(invitationCode)
-      await joinCommunityModal.submit()
-    })
-
-    it.skip('RegisterUsernameModal - User tries to register already taken username, sees error', async () => {
-      console.log('new user - 4')
-      registerModal2 = new RegisterUsernameModal(guestApp.driver)
-      const isRegisterModal2 = await registerModal2.element.isDisplayed()
-      expect(isRegisterModal2).toBeTruthy()
-      await registerModal2.typeUsername(ownerUsername)
-      await registerModal2.submit()
-      const usernameTakenError = await registerModal2.error.isDisplayed()
-      expect(usernameTakenError).toBeTruthy()
-    })
-
-    it('RegisterUsernameModal - User successfully register not taken username', async () => {
-      console.log('new user - 5')
-      registerModal2 = new RegisterUsernameModal(guestApp.driver)
-      const isRegisterModal = await registerModal2.element.isDisplayed()
-      expect(isRegisterModal).toBeTruthy()
-      await registerModal2.clearInput()
-      await registerModal2.typeUsername(joiningUserUsername)
-      await registerModal2.submit()
-    })
-
-    it.skip('JoiningLoadingPanel', async () => {
-      console.log('new user - 6')
-      const loadingPanelCommunity2 = new JoiningLoadingPanel(ownerApp.driver)
-      const isLoadingPanelCommunity2 = await loadingPanelCommunity2.element.isDisplayed()
-      expect(isLoadingPanelCommunity2).toBeTruthy()
-    })
-    it('User sends a message', async () => {
-      console.log('new user - 7')
-      generalChannel2 = new Channel(guestApp.driver, 'general')
-      await generalChannel2.element.isDisplayed()
-      const isMessageInput2 = await generalChannel2.messageInput.isDisplayed()
-      expect(isMessageInput2).toBeTruthy()
-      console.log('FETCHING CHANNEL MESSAGES!')
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 15000)
-      )
-      await generalChannel2.sendMessage(joiningUserMessages[0])
-    })
-    it('Sent message is visible in a channel', async () => {
-      console.log('new user - 8')
-      const messages2 = await generalChannel2.getUserMessages(joiningUserUsername)
-      const messages1 = await generalChannel2.getUserMessages(ownerUsername)
-
-      console.log({ messages1, messages2 })
-      const text2 = await messages2[0].getText()
-      expect(text2).toEqual(joiningUserMessages[0])
-    })
-
-    it('Channel creation - Owner create second channel', async () => {
-      sidebar = new Sidebar(ownerApp.driver)
-      await sidebar.addNewChannel(newChannelName)
-      await sidebar.switchChannel(newChannelName)
-      const channels = await sidebar.getChannelList()
-      expect(channels.length).toEqual(2)
-    })
-    it('Channel creation - Owner send message in second channel', async () => {
-      secondChannel = new Channel(ownerApp.driver, newChannelName)
-      const isMessageInput = await secondChannel.messageInput.isDisplayed()
-      expect(isMessageInput).toBeTruthy()
-      await secondChannel.sendMessage(ownerMessages[1])
-    })
-    it('Channel creation - User read message in second channel', async () => {
-      sidebar2 = new Sidebar(guestApp.driver)
-      await sidebar2.switchChannel(newChannelName)
-      secondChannel2 = new Channel(guestApp.driver, newChannelName)
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 2000)
-      )
-      const messages = await secondChannel2.getUserMessages(ownerUsername)
-      const text = await messages[1].getText()
-      expect(text).toEqual(ownerMessages[1])
-    })
-    it('Channel deletion - Owner delete second channel', async () => {
-      channelContextMenu = new ChannelContextMenu(ownerApp.driver)
-      await channelContextMenu.openMenu()
-      await channelContextMenu.openDeletionChannelModal()
-      await channelContextMenu.deleteChannel()
-      const channels = await sidebar.getChannelList()
-      expect(channels.length).toEqual(1)
-    })
-    it('Channel deletion - User see info about channel deletion in general channel', async () => {
-      await sleep(5000)
-      const messages = await generalChannel2.getUserMessages(ownerUsername)
-      const text = await messages[3].getText()
-      expect(text).toEqual(`@${ownerUsername} deleted #${newChannelName}`)
-    })
-    it('Channel deletion - User can create channel with the same name and is fresh channel', async () => {
-      console.log('TEST 1')
-      await sidebar2.addNewChannel(newChannelName)
-      await sidebar2.switchChannel(newChannelName)
-      const messages = await secondChannel2.getUserMessages(joiningUserUsername)
-      expect(messages.length).toEqual(1)
-      await new Promise<void>(resolve =>
-        setTimeout(() => {
-          resolve()
-        }, 2000)
-      )
-      const channels = await sidebar.getChannelList()
-      expect(channels.length).toEqual(2)
-    })
-    // End of tests for Windows
-    if (process.platform !== 'win32') {
-      it('Leave community', async () => {
-        console.log('TEST 2')
-        const settingsModal = await new Sidebar(guestApp.driver).openSettings()
-        const isSettingsModal = await settingsModal.element.isDisplayed()
-        expect(isSettingsModal).toBeTruthy()
-        await settingsModal.openLeaveCommunityModal()
-        await settingsModal.leaveCommunityButton()
-      })
-      if (process.env.TEST_MODE) {
-        it('Leave community - Close debug modal', async () => {
-          const debugModal = new DebugModeModal(guestApp.driver)
-          await debugModal.close()
-        })
-      }
-      // Delete general channel while guest is absent
-      it('Channel deletion - Owner recreate general channel', async () => {
-        console.log('TEST 3')
-        await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
-        const isGeneralChannel = await generalChannel.messageInput.isDisplayed()
-        expect(isGeneralChannel).toBeTruthy()
-        await channelContextMenu.openMenu()
-        await channelContextMenu.openDeletionChannelModal()
-        await channelContextMenu.deleteChannel()
-        const channels = await sidebar.getChannelList()
-        expect(channels.length).toEqual(2)
-      })
-
-      it('Leave community - Guest re-join to community successfully', async () => {
-        console.log('TEST 4')
-        const joinCommunityModal = new JoinCommunityModal(guestApp.driver)
-        const isJoinCommunityModal = await joinCommunityModal.element.isDisplayed()
-        expect(isJoinCommunityModal).toBeTruthy()
-        await joinCommunityModal.typeCommunityCode(invitationCode)
-        await joinCommunityModal.submit()
-      })
-      it('Leave community - Guest register new username', async () => {
-        console.log('TEST 5')
-        const registerModal2 = new RegisterUsernameModal(guestApp.driver)
-        const isRegisterModal2 = await registerModal2.element.isDisplayed()
-        expect(isRegisterModal2).toBeTruthy()
-        await registerModal2.typeUsername(joiningUserUsername2)
-        await registerModal2.submit()
-      })
-
-      // Check correct channels replication
-      it('Channel deletion - User see information about recreation general channel and see correct amount of messages', async () => {
-        console.log('TEST 6')
-        generalChannel2 = new Channel(guestApp.driver, 'general')
-        await generalChannel2.element.isDisplayed()
-        await new Promise<void>(resolve =>
-          setTimeout(() => {
-            resolve()
-          }, 10000)
-        )
-        const messages = await generalChannel2.getUserMessages(ownerUsername)
-        const text1 = await messages[0].getText()
-        const text2 = await messages[1].getText()
-        expect(messages.length).toEqual(2)
-        expect(text1).toEqual(`@${ownerUsername} deleted all messages in #general`)
-        expect(text2).toEqual(`@${joiningUserUsername2} has joined Testcommunity! 🎉`)
-      })
-
-      it('Leave community - Guest sends a message', async () => {
-        console.log('TEST 7')
-        generalChannel2 = new Channel(guestApp.driver, 'general')
-        await generalChannel2.element.isDisplayed()
-        const isMessageInput2 = await generalChannel2.messageInput.isDisplayed()
-        expect(isMessageInput2).toBeTruthy()
-        await new Promise<void>(resolve =>
-          setTimeout(() => {
-            resolve()
-          }, 5000)
-        )
-        await generalChannel2.sendMessage(joiningUserMessages[1])
-      })
-      it('Leave community - Sent message is visible in a channel', async () => {
-        console.log('TEST 8')
-        const messages2 = await generalChannel2.getUserMessages(joiningUserUsername2)
-        const text2 = await messages2[0].getText()
-        expect(text2).toEqual(joiningUserMessages[1])
-      })
-      it('Owner close app', async () => {
-        await ownerApp.close({ forceSaveState: true })
-        await new Promise<void>(resolve => setTimeout(() => resolve(), 20000))
-      })
-
-      it('Guest close app', async () => {
-        console.log('TEST 9')
-        await guestApp?.close()
-      })
-
-      it('Owner re-open app', async () => {
-        await ownerApp?.open()
-        await new Promise<void>(resolve => setTimeout(() => resolve(), 10000))
-      })
-
-      if (process.env.TEST_MODE) {
-        it('Close debug modal', async () => {
-          const debugModal = new DebugModeModal(ownerApp.driver)
-          await debugModal.close()
-        })
-      }
-
-      it('Guest close app - Owner send another message after guest leave app', async () => {
-        console.log('TEST 10')
-        generalChannel = new Channel(ownerApp.driver, 'general')
-        const isMessageInput = await generalChannel.messageInput.isDisplayed()
-        expect(isMessageInput).toBeTruthy()
-        await generalChannel.sendMessage(ownerMessages[2])
-      })
-      it('Guest close app - Check if message is visible for owner', async () => {
-        console.log('TEST 11')
-        const messages = await generalChannel.getUserMessages(ownerUsername)
-        const text = await messages[messages.length - 1].getText()
-        expect(text).toEqual(ownerMessages[2])
-      })
-    }
-  })
-})
diff --git a/packages/e2e-tests/src/utils.ts b/packages/e2e-tests/src/utils.ts
index 70ba424d44..7379e81199 100644
--- a/packages/e2e-tests/src/utils.ts
+++ b/packages/e2e-tests/src/utils.ts
@@ -1,5 +1,5 @@
 import { Browser, Builder, type ThenableWebDriver } from 'selenium-webdriver'
-import { spawn, exec, type ChildProcessWithoutNullStreams, execSync } from 'child_process'
+import { spawn, exec, execSync, type ChildProcessWithoutNullStreams } from 'child_process'
 import { type SupportedPlatformDesktop } from '@quiet/types'
 import getPort from 'get-port'
 import path from 'path'
@@ -15,8 +15,6 @@ export interface BuildSetupInit {
 
 export class BuildSetup {
   private driver?: ThenableWebDriver | null
-  public containerId?: string
-  public ipAddress?: string
   public port?: number
   public debugPort?: number
   public dataDir?: string
@@ -104,16 +102,16 @@ export class BuildSetup {
     await this.initPorts()
     const env = {
       DATA_DIR: this.dataDir || 'Quiet',
-      DEBUG: 'backend*',
+      DEBUG: 'backend*,desktop*',
     }
     if (process.platform === 'win32') {
       console.log('!WINDOWS!')
-      this.child = spawn(`cd node_modules/.bin & chromedriver.cmd --port=${this.port}`, [], {
+      this.child = spawn(`cd node_modules/.bin & chromedriver.cmd --port=${this.port} --verbose`, [], {
         shell: true,
         env: Object.assign(process.env, env),
       })
     } else {
-      this.child = spawn(`node_modules/.bin/chromedriver --port=${this.port}`, [], {
+      this.child = spawn(`node_modules/.bin/chromedriver --port=${this.port} --verbose`, [], {
         shell: true,
         detached: false,
         env: Object.assign(process.env, env),
@@ -127,7 +125,7 @@ export class BuildSetup {
     )
 
     this.child.on('error', () => {
-      console.log('ERROR')
+      console.error('ERROR')
       this.killNine()
     })
 
@@ -145,7 +143,7 @@ export class BuildSetup {
       console.log('message', data)
     })
     this.child.on('error', data => {
-      console.log('error', data)
+      console.error('error', data)
     })
 
     this.child.stdout.on('data', data => {
@@ -153,11 +151,17 @@ export class BuildSetup {
     })
 
     this.child.stderr.on('data', data => {
-      console.error(`stderr: ${data}`)
+      // Quiet logs (handled by 'debug' package) are available in stderr and only with 'verbose' flag on chromedriver
+      const trashLogs = ['DevTools', 'COMMAND', 'INFO:CONSOLE', '[INFO]:', 'libnotify-WARNING', 'ALSA lib']
+      const dataString = `${data}`
+      for (const l of trashLogs) {
+        if (dataString.includes(l)) return
+      }
+      console.log(dataString)
     })
 
     this.child.stdin.on('data', data => {
-      console.error(`stdin: ${data}`)
+      console.log(`stdin: ${data}`)
     })
   }
 
@@ -196,7 +200,7 @@ export class BuildSetup {
       }
     }
     if (this.driver == null || this.driver === undefined) {
-      throw new Error('elo')
+      throw new Error('No driver')
     }
 
     return this.driver
diff --git a/packages/eslint-config-custom/CHANGELOG.md b/packages/eslint-config-custom/CHANGELOG.md
index 395692e02b..4c85ddeb75 100644
--- a/packages/eslint-config-custom/CHANGELOG.md
+++ b/packages/eslint-config-custom/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/eslint-config@2.0.1-alpha.1...@quiet/eslint-config@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/eslint-config
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/eslint-config@2.0.1-alpha.0...@quiet/eslint-config@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/eslint-config
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/eslint-config@1.4.0-alpha.0...@quiet/eslint-config@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/eslint-config
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/eslint-config@1.4.0-alpha.0...@quiet/eslint-config@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/eslint-config
diff --git a/packages/eslint-config-custom/package-lock.json b/packages/eslint-config-custom/package-lock.json
index 3389aa56ea..4b92844357 100644
--- a/packages/eslint-config-custom/package-lock.json
+++ b/packages/eslint-config-custom/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/eslint-config",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/eslint-config",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "5.59.11",
         "@typescript-eslint/parser": "^5.59.11",
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index 5951f2b85f..f02723b88a 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@quiet/eslint-config",
   "main": "index.js",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "private": true,
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "5.59.11",
diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md
index 419117b1d1..9fa34ebaf5 100644
--- a/packages/identity/CHANGELOG.md
+++ b/packages/identity/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.1...@quiet/identity@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/identity
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.0...@quiet/identity@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/identity
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.0-alpha.3...@quiet/identity@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/identity
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.0-alpha.3...@quiet/identity@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/identity
diff --git a/packages/identity/package-lock.json b/packages/identity/package-lock.json
index 9a802a4cd2..7532616bbe 100644
--- a/packages/identity/package-lock.json
+++ b/packages/identity/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/identity",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "MIT",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/identity/package.json b/packages/identity/package.json
index 99f0530542..703b9ddc46 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "Quiet tools for creating certificates and signing messages",
   "main": "lib/index.js",
   "types": "lib/index.d.js",
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
-    "@quiet/logger": "^2.0.0-alpha.18",
-    "@quiet/types": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
+    "@quiet/logger": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.2",
     "pkijs": "^3.0.8"
   },
   "devDependencies": {
diff --git a/packages/identity/src/common.ts b/packages/identity/src/common.ts
index ab64be1285..fe3c851587 100644
--- a/packages/identity/src/common.ts
+++ b/packages/identity/src/common.ts
@@ -1,15 +1,8 @@
 import { NoCryptoEngineError } from '@quiet/types'
 import { fromBER, type ObjectIdentifier } from 'asn1js'
-import {
-  getAlgorithmParameters,
-  getCrypto,
-  CertificationRequest,
-  Certificate,
-  TSTInfo,
-  ECNamedCurves,
-  type AttributeTypeAndValue,
-} from 'pkijs'
+import { getAlgorithmParameters, getCrypto, CertificationRequest, Certificate, type AttributeTypeAndValue } from 'pkijs'
 import { stringToArrayBuffer, fromBase64 } from 'pvutils'
+import { keyFromCertificate, parseCertificate } from './extractPubKey'
 
 export enum CertFieldsTypes {
   commonName = '2.5.4.3',
@@ -149,3 +142,29 @@ export const getReqFieldValue = (
     }
   }
 }
+
+export const pubKeyMatch = (cert: string, parsedCsr: CertificationRequest): boolean => {
+  const parsedCertificate = parseCertificate(cert)
+  const pubKey = keyFromCertificate(parsedCertificate)
+  const pubKeyCsr = keyFromCertificate(parsedCsr)
+
+  if (pubKey === pubKeyCsr) {
+    return true
+  }
+  return false
+}
+
+// TODO: generalize to certificateByField
+export const certificateByUsername = (username: string, certificates: string[]): string | null => {
+  /**
+   * Check if given username is already in use
+   */
+  for (const cert of certificates) {
+    const parsedCert = parseCertificate(cert)
+    const certUsername = getCertFieldValue(parsedCert, CertFieldsTypes.nickName)
+    if (certUsername?.localeCompare(username, 'en', { sensitivity: 'base' }) === 0) {
+      return cert
+    }
+  }
+  return null
+}
diff --git a/packages/identity/src/generateRootCA.ts b/packages/identity/src/createRootCA.ts
similarity index 100%
rename from packages/identity/src/generateRootCA.ts
rename to packages/identity/src/createRootCA.ts
diff --git a/packages/identity/src/generateUserCertificate.ts b/packages/identity/src/createUserCert.ts
similarity index 100%
rename from packages/identity/src/generateUserCertificate.ts
rename to packages/identity/src/createUserCert.ts
diff --git a/packages/identity/src/requestCertificate.ts b/packages/identity/src/createUserCsr.ts
similarity index 91%
rename from packages/identity/src/requestCertificate.ts
rename to packages/identity/src/createUserCsr.ts
index bd991e697e..eee73dbc27 100644
--- a/packages/identity/src/requestCertificate.ts
+++ b/packages/identity/src/createUserCsr.ts
@@ -21,6 +21,7 @@ export const createUserCsr = async ({
   commonName,
   peerId,
   dmPublicKey,
+  existingKeyPair,
 }: {
   nickname: string
   commonName: string
@@ -28,13 +29,16 @@ export const createUserCsr = async ({
   dmPublicKey: string
   signAlg: string
   hashAlg: string
+  existingKeyPair?: CryptoKeyPair
 }): Promise<UserCsr> => {
   const pkcs10 = await requestCertificate({
     nickname,
     commonName,
     peerId,
     dmPublicKey,
-    ...config,
+    signAlg: config.signAlg,
+    hashAlg: config.hashAlg,
+    existingKeyPair,
   })
   const crypto = getCrypto()
   if (!crypto) throw new NoCryptoEngineError()
@@ -58,6 +62,7 @@ async function requestCertificate({
   dmPublicKey,
   signAlg = config.signAlg,
   hashAlg = config.hashAlg,
+  existingKeyPair,
 }: {
   nickname: string
   commonName: string
@@ -65,8 +70,9 @@ async function requestCertificate({
   dmPublicKey: string
   signAlg: string
   hashAlg: string
+  existingKeyPair?: CryptoKeyPair
 }): Promise<CertData> {
-  const keyPair: CryptoKeyPair = await generateKeyPair({ signAlg })
+  const keyPair: CryptoKeyPair = existingKeyPair ? existingKeyPair : await generateKeyPair({ signAlg })
 
   const arrayBufferDmPubKey = hexStringToArrayBuffer(dmPublicKey)
 
diff --git a/packages/identity/src/extractPubKey.ts b/packages/identity/src/extractPubKey.ts
index de51c87d9f..e6e4dd9483 100644
--- a/packages/identity/src/extractPubKey.ts
+++ b/packages/identity/src/extractPubKey.ts
@@ -1,7 +1,7 @@
 import { fromBase64, stringToArrayBuffer } from 'pvutils'
 import { fromBER } from 'asn1js'
 import config from './config'
-import { getAlgorithmParameters, Certificate, CertificationRequest } from 'pkijs'
+import { getAlgorithmParameters, Certificate, CertificationRequest, getCrypto } from 'pkijs'
 import { NoCryptoEngineError } from '@quiet/types'
 
 export const parseCertificate = (pem: string): Certificate => {
@@ -28,6 +28,11 @@ export const pubKeyFromCsr = (csr: string) => {
   return derBuffer
 }
 
+export const getPubKey = async (pubKeyString: string): Promise<CryptoKey> => {
+  const crypto = getCrypto()
+  return keyObjectFromString(pubKeyString, crypto)
+}
+
 export const keyObjectFromString = async (pubKeyString: string, crypto: SubtleCrypto | null): Promise<CryptoKey> => {
   if (!crypto) throw new NoCryptoEngineError()
   let keyArray = new ArrayBuffer(0)
diff --git a/packages/identity/src/index.ts b/packages/identity/src/index.ts
index d2f6b21a2e..392dc63491 100644
--- a/packages/identity/src/index.ts
+++ b/packages/identity/src/index.ts
@@ -1,4 +1,4 @@
-import { createRootCA, type RootCA } from './generateRootCA'
+import { createRootCA, type RootCA } from './createRootCA'
 import {
   extractPubKey,
   parseCertificate,
@@ -7,12 +7,13 @@ import {
   keyObjectFromString,
   extractPubKeyString,
   pubKeyFromCsr,
+  getPubKey,
 } from './extractPubKey'
 import { verifyUserCert } from './verifyUserCertificate'
-import { verifySignature } from './verification'
+import { verifySignature } from './verifySignature'
 import { sign } from './sign'
-import { createUserCsr, type UserCsr } from './requestCertificate'
-import { createUserCert, type UserCert } from './generateUserCertificate'
+import { createUserCsr, type UserCsr } from './createUserCsr'
+import { createUserCert, type UserCert } from './createUserCert'
 import {
   loadPrivateKey,
   loadCSR,
@@ -24,6 +25,8 @@ import {
   hexStringToArrayBuffer,
   arrayBufferToHexString,
   getReqFieldValue,
+  certificateByUsername,
+  pubKeyMatch,
 } from './common'
 import configCrypto from './config'
 import {
@@ -46,6 +49,7 @@ export {
   extractPubKeyString,
   pubKeyFromCsr,
   parseCertificationRequest,
+  getPubKey,
 }
 export { verifyUserCert }
 export { verifySignature }
@@ -62,6 +66,8 @@ export {
   CertFieldsTypes,
   hexStringToArrayBuffer,
   arrayBufferToHexString,
+  certificateByUsername,
+  pubKeyMatch,
 }
 export { configCrypto }
 export { setupCrypto }
diff --git a/packages/identity/src/test/helpers.ts b/packages/identity/src/test/helpers.ts
index b335339b87..5a79e698ef 100644
--- a/packages/identity/src/test/helpers.ts
+++ b/packages/identity/src/test/helpers.ts
@@ -1,8 +1,8 @@
 import { Time, setEngine, CryptoEngine } from 'pkijs'
 import { Crypto } from '@peculiar/webcrypto'
-import { createRootCA, type RootCA } from '../generateRootCA'
-import { createUserCert, type UserCert } from '../generateUserCertificate'
-import { createUserCsr, type UserCsr } from '../requestCertificate'
+import { createRootCA, type RootCA } from '../createRootCA'
+import { createUserCert, type UserCert } from '../createUserCert'
+import { createUserCsr, type UserCsr } from '../createUserCsr'
 import config from '../config'
 
 export const userData = {
diff --git a/packages/identity/src/test/index.test.ts b/packages/identity/src/test/index.test.ts
index 8332c728ce..23a1f69dfb 100644
--- a/packages/identity/src/test/index.test.ts
+++ b/packages/identity/src/test/index.test.ts
@@ -1,7 +1,7 @@
 import { Crypto } from '@peculiar/webcrypto'
 import { sign } from '../sign'
 import { extractPubKey, parseCertificate, parseCertificationRequest } from '../extractPubKey'
-import { verifySignature } from '../verification'
+import { verifySignature } from '../verifySignature'
 import { verifyUserCert } from '../verifyUserCertificate'
 import { createTestRootCA, createTestUserCert, createTestUserCsr, userData } from './helpers'
 import { CertFieldsTypes, getCertFieldValue, getReqFieldValue } from '../common'
diff --git a/packages/identity/src/verification.ts b/packages/identity/src/verifySignature.ts
similarity index 100%
rename from packages/identity/src/verification.ts
rename to packages/identity/src/verifySignature.ts
diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index e973ffdf08..40a36fc5b8 100644
--- a/packages/integration-tests/CHANGELOG.md
+++ b/packages/integration-tests/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.1...integration-tests@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/integration-tests@2.0.1-alpha.0...integration-tests@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/integration-tests@2.0.0-alpha.4...integration-tests@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/integration-tests@2.0.0-alpha.4...integration-tests@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package integration-tests
diff --git a/packages/integration-tests/package-lock.json b/packages/integration-tests/package-lock.json
index be67b3bebc..4fc63aec00 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 6dc775f591..2cd06c3f6b 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "@babel/core": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@types/jest": "^26.0.24",
     "@types/redux-saga": "^0.10.5",
     "@types/tmp": "^0.2.2",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/identity": "^2.0.0-alpha.18",
-    "@quiet/logger": "^2.0.0-alpha.18",
-    "@quiet/state-manager": "^2.0.0-alpha.18",
+    "@quiet/identity": "^2.0.1-alpha.2",
+    "@quiet/logger": "^2.0.1-alpha.2",
+    "@quiet/state-manager": "^2.0.1-alpha.2",
     "@reduxjs/toolkit": "^1.6.1",
     "commander": "^9.1.0",
     "debug": "^4.3.2",
diff --git a/packages/integration-tests/src/integrationTests/appActions.ts b/packages/integration-tests/src/integrationTests/appActions.ts
index 1addb1a517..239f0c4b51 100644
--- a/packages/integration-tests/src/integrationTests/appActions.ts
+++ b/packages/integration-tests/src/integrationTests/appActions.ts
@@ -99,7 +99,7 @@ export async function createCommunity({ userName, store }: CreateCommunity) {
     expect(store.getState().Identity.identities.entities[communityId].peerId.id).toHaveLength(46)
   }, timeout)
 
-  store.dispatch(identity.actions.registerUsername(userName))
+  store.dispatch(identity.actions.registerUsername({ nickname: userName }))
 
   await waitForExpect(() => {
     expect(store.getState().Identity.identities.entities[communityId].userCertificate).toBeTruthy()
@@ -159,7 +159,7 @@ export async function registerUsername(payload: Register) {
     expect(store.getState().Identity.identities.entities[communityId].peerId.id).toHaveLength(46)
   }, timeout)
 
-  store.dispatch(identity.actions.registerUsername(userName))
+  store.dispatch(identity.actions.registerUsername({ nickname: userName }))
 }
 
 export async function sendCsr(store: Store) {
@@ -307,5 +307,5 @@ export const sendRegistrationRequest = async (payload: SendRegistrationRequest)
     expect(store.getState().Identity.identities.entities[communityId].peerId.id).toHaveLength(46)
   }, timeout)
 
-  store.dispatch(identity.actions.registerUsername(userName))
+  store.dispatch(identity.actions.registerUsername({ nickname: userName }))
 }
diff --git a/packages/integration-tests/src/testUtils/actions.ts b/packages/integration-tests/src/testUtils/actions.ts
index 4c4d94677e..7b914f99aa 100644
--- a/packages/integration-tests/src/testUtils/actions.ts
+++ b/packages/integration-tests/src/testUtils/actions.ts
@@ -43,7 +43,7 @@ export async function registerUsername(payload: Register) {
   }, timeout)
 
   log(`User ${userName} starts registering username`)
-  store.dispatch(identity.actions.registerUsername(userName))
+  store.dispatch(identity.actions.registerUsername({ nickname: userName }))
 }
 
 export const createCommunity = async ({ username, communityName, store }): Promise<string> => {
diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
index f59fc1701d..7f3d4120ee 100644
--- a/packages/logger/CHANGELOG.md
+++ b/packages/logger/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/logger@2.0.1-alpha.1...@quiet/logger@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/logger
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/logger@2.0.1-alpha.0...@quiet/logger@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/logger
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/logger@1.7.0-alpha.1...@quiet/logger@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/logger
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/logger@1.7.0-alpha.1...@quiet/logger@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/logger
diff --git a/packages/logger/package-lock.json b/packages/logger/package-lock.json
index 81c5b6654f..475378ed38 100644
--- a/packages/logger/package-lock.json
+++ b/packages/logger/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/logger",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 2c92751c8a..b3e09bf385 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "Logger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@types/debug": "^4.1.7",
     "@types/node": "^17.0.21",
     "typescript": "^4.9.3"
diff --git a/packages/mobile/.storybook/index.js b/packages/mobile/.storybook/index.js
index 8f98f01d65..703004a968 100644
--- a/packages/mobile/.storybook/index.js
+++ b/packages/mobile/.storybook/index.js
@@ -15,6 +15,7 @@ addDecorator(withNavigation)
 configure(() => {
   require('../src/components/JoinCommunity/JoinCommunity.stories')
   require('../src/components/LeaveCommunity/LeaveCommunity.stories')
+  require('../src/components/ConnectionProcess/ConnectionProcess.stories')
   require('../src/components/ContextMenu/ContextMenu.stories')
   require('../src/components/ConfirmationBox/ConfirmationBox.stories')
   require('../src/components/CreateCommunity/CreateCommunity.stories')
@@ -34,8 +35,11 @@ configure(() => {
   require('../src/components/MessageSendButton/MessageSendButton.stories')
   require('../src/components/InitCheck/InitCheck.stories')
   require('../src/components/Loading/Loading.stories')
+  require('../src/components/Splash/Splash.stories')
   require('../src/components/Success/Success.stories')
   require('../src/components/Error/Error.stories')
+  require('../src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.stories')
+  require('../src/components/FileUploadingPreview/UploadingPreview.stories')
 }, module)
 
 const StorybookUIRoot = getStorybookUI({
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
index 54765330fe..2aae633e63 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.8...@quiet/mobile@2.0.1-alpha.2) (2023-10-09)
+
+
+### Bug Fixes
+
+* typo in function name ([7e00db1](https://github.com/TryQuiet/quiet/commit/7e00db1eb8d868cfe6682a1fa75f7e90b3a496bb))
+
+
+### Reverts
+
+* Revert "Match designs for mobile chat input (#1841)" ([e57fbca](https://github.com/TryQuiet/quiet/commit/e57fbcadcc51995c0360ee3b7b7fba201f4a9605)), closes [#1841](https://github.com/TryQuiet/quiet/issues/1841)
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.1-alpha.0...@quiet/mobile@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.0-alpha.15...@quiet/mobile@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
 # [2.0.0-alpha.21](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.0-alpha.20...@quiet/mobile@2.0.0-alpha.21) (2023-10-09)
 
 **Note:** Version bump only for package @quiet/mobile
@@ -29,46 +61,45 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@1.10.8...@quiet/mobile@2.0.0-alpha.18) (2023-10-04)
 
+**Note:** Version bump only for package @quiet/mobile
 
-### Bug Fixes
 
-* typo in function name ([7e00db1](https://github.com/ZbayApp/monorepo/commit/7e00db1eb8d868cfe6682a1fa75f7e90b3a496bb))
 
 
 
+# [2.0.0-alpha.15](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.0-alpha.14...@quiet/mobile@2.0.0-alpha.15) (2023-09-22)
 
+**Note:** Version bump only for package @quiet/mobile
 
-# [2.0.0-alpha.10](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.9...@quiet/mobile@2.0.0-alpha.10) (2023-09-19)
 
-**Note:** Version bump only for package @quiet/mobile
 
 
 
+# [2.0.0-alpha.14](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.0-alpha.13...@quiet/mobile@2.0.0-alpha.14) (2023-09-22)
 
+**Note:** Version bump only for package @quiet/mobile
 
-# [2.0.0-alpha.9](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.5...@quiet/mobile@2.0.0-alpha.9) (2023-09-18)
 
 
-### Bug Fixes
 
-* typo in function name ([7e00db1](https://github.com/TryQuiet/quiet/commit/7e00db1eb8d868cfe6682a1fa75f7e90b3a496bb))
 
+# [2.0.0-alpha.13](https://github.com/ZbayApp/monorepo/compare/@quiet/mobile@2.0.0-alpha.12...@quiet/mobile@2.0.0-alpha.13) (2023-09-22)
 
+**Note:** Version bump only for package @quiet/mobile
 
 
 
-# [2.0.0-alpha.8](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.7...@quiet/mobile@2.0.0-alpha.8) (2023-09-14)
 
 
-### Bug Fixes
+# [2.0.0-alpha.12](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.11...@quiet/mobile@2.0.0-alpha.12) (2023-09-20)
 
-* typo in function name ([7e00db1](https://github.com/TryQuiet/quiet/commit/7e00db1eb8d868cfe6682a1fa75f7e90b3a496bb))
+**Note:** Version bump only for package @quiet/mobile
 
 
 
 
 
-# [2.0.0-alpha.7](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.6...@quiet/mobile@2.0.0-alpha.7) (2023-09-07)
+# [2.0.0-alpha.11](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.10...@quiet/mobile@2.0.0-alpha.11) (2023-09-19)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -76,7 +107,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.10.8](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.7...@quiet/mobile@1.10.8) (2023-10-03)
+# [2.0.0-alpha.10](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.9...@quiet/mobile@2.0.0-alpha.10) (2023-09-19)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -84,7 +115,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.10.7](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.6...@quiet/mobile@1.10.7) (2023-10-03)
+# [2.0.0-alpha.9](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.5...@quiet/mobile@2.0.0-alpha.9) (2023-09-18)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -92,7 +123,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.10.6](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.5...@quiet/mobile@1.10.6) (2023-09-25)
+# [2.0.0-alpha.8](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.7...@quiet/mobile@2.0.0-alpha.8) (2023-09-14)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -100,7 +131,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.10.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.4...@quiet/mobile@1.10.5) (2023-09-15)
+# [2.0.0-alpha.7](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.6...@quiet/mobile@2.0.0-alpha.7) (2023-09-07)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -109,7 +140,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.5...@quiet/mobile@2.0.0-alpha.6) (2023-09-07)
-## [1.10.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.3...@quiet/mobile@1.10.4) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -118,7 +148,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.4...@quiet/mobile@2.0.0-alpha.5) (2023-09-06)
-## [1.10.3](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.2...@quiet/mobile@1.10.3) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -127,7 +156,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [2.0.0-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.0-alpha.3...@quiet/mobile@2.0.0-alpha.4) (2023-09-06)
-## [1.10.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.1...@quiet/mobile@1.10.2) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
 
@@ -168,6 +196,69 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 # [1.11.0-alpha.0](/compare/@quiet/mobile@1.10.0...@quiet/mobile@1.11.0-alpha.0) (2023-08-29)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.8](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.7...@quiet/mobile@1.10.8) (2023-10-03)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.7](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.6...@quiet/mobile@1.10.7) (2023-10-03)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.6](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.5...@quiet/mobile@1.10.6) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.4...@quiet/mobile@1.10.5) (2023-09-15)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.3...@quiet/mobile@1.10.4) (2023-09-15)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.3](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.2...@quiet/mobile@1.10.3) (2023-09-15)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [1.10.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.1...@quiet/mobile@1.10.2) (2023-09-15)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
 ## [1.10.1](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@1.10.0...@quiet/mobile@1.10.1) (2023-09-15)
 
 **Note:** Version bump only for package @quiet/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index 61604913ba..f6ce436592 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -166,8 +166,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 339
-        versionName "2.0.0-alpha.21"
+        versionCode 340
+        versionName "2.0.1-alpha.2"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/packages/mobile/assets/icons/paperclip_black.png b/packages/mobile/assets/icons/paperclip_black.png
deleted file mode 100644
index 7bd53562a2..0000000000
Binary files a/packages/mobile/assets/icons/paperclip_black.png and /dev/null differ
diff --git a/packages/mobile/assets/icons/paperclip_gray.png b/packages/mobile/assets/icons/paperclip_gray.png
index bc7b87854b..c456f996b2 100644
Binary files a/packages/mobile/assets/icons/paperclip_gray.png and b/packages/mobile/assets/icons/paperclip_gray.png differ
diff --git a/packages/mobile/e2e/storybook.test.js b/packages/mobile/e2e/storybook.test.js
index c17ec12611..2ae84bd51a 100644
--- a/packages/mobile/e2e/storybook.test.js
+++ b/packages/mobile/e2e/storybook.test.js
@@ -15,6 +15,11 @@ const { ios } = info
 
 jest.setTimeout(9000000)
 
+const blacklist = [
+  'ConnectionProcess',
+  'UploadingPreview'
+]
+
 /* eslint-disable no-undef */
 describe('Storybook', () => {
   let stories = []
@@ -31,7 +36,9 @@ describe('Storybook', () => {
         if (item.endsWith('.stories.tsx')) {
           const scenarios = await listScenarios(dirname, item)
           const component = item.split('.')[0]
-          files.push([dirname, item, component, scenarios])
+          if (!blacklist.includes(component)) {
+            files.push([dirname, item, component, scenarios])
+          }
         }
       }
     }
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--default.png
index 6ce10bd5c4..6209cb640b 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--empty.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--empty.png
index a23cc6253f..a1fc08c6aa 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--empty.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/chat--empty.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/confirmationbox--linkcopied.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/confirmationbox--linkcopied.png
index 3c24e80f97..48382cb782 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/confirmationbox--linkcopied.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/confirmationbox--linkcopied.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--community.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--community.png
index 9d14f16133..bb25c43d81 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--community.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--community.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--invitation.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--invitation.png
index 29cbf4d892..8c182271a1 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--invitation.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/contextmenu--invitation.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createchannel--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createchannel--default.png
index e7e8ebacbc..b2585db112 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createchannel--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createchannel--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createcommunity--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createcommunity--default.png
index da787a8ccf..d0e37d1821 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createcommunity--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/createcommunity--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--default.png
index bf51bd8721..381dc092a0 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--disabled.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--disabled.png
index b50f29524a..ec3056429f 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--disabled.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--disabled.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hint.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hint.png
index fe79a0a79c..7683f029c8 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hint.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hint.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hintvalidation.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hintvalidation.png
index f704d04d6e..cab1ea8bee 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hintvalidation.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--hintvalidation.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--label.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--label.png
index 47ddf58045..b318dd0776 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--label.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--label.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--validation.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--validation.png
index a823ded558..a99a43b009 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--validation.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/input--validation.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/joincommunity--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/joincommunity--default.png
index 7b4e0f9e31..100bfe8f77 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/joincommunity--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/joincommunity--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--0.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--0.png
deleted file mode 100644
index 4c96c4ddeb..0000000000
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--0.png and /dev/null differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--99.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--99.png
deleted file mode 100644
index 4c96c4ddeb..0000000000
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--99.png and /dev/null differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--default.png
index 647e479545..2ca7d9c99a 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/loading--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/message--link.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/message--link.png
index ebe85d5c1a..2bd56b1ba3 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/message--link.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/message--link.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--default.png
index 8ebc3a01b2..5c61e1d83f 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--disabled.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--disabled.png
index 91130cc42e..3eef2df8b8 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--disabled.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/messagesendbutton--disabled.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/possibleimpersonationattack--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/possibleimpersonationattack--default.png
new file mode 100644
index 0000000000..248a6e9964
Binary files /dev/null and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/possibleimpersonationattack--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/splash--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/splash--default.png
new file mode 100644
index 0000000000..fa1c5fdc13
Binary files /dev/null and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/splash--default.png differ
diff --git a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/usernameregistration--default.png b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/usernameregistration--default.png
index 1d0217a0b5..f7d7fae57c 100644
Binary files a/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/usernameregistration--default.png and b/packages/mobile/e2e/visual-regressions/ci/ios/storybook-base-screenshots/usernameregistration--default.png differ
diff --git a/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/Contents.json b/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/Contents.json
new file mode 100644
index 0000000000..5f670ca877
--- /dev/null
+++ b/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "logo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/logo.png b/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/logo.png
new file mode 100644
index 0000000000..e69068a2d1
Binary files /dev/null and b/packages/mobile/ios/Quiet/Images.xcassets/Logo.imageset/logo.png differ
diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist
index 9bb8a68a26..d28dfa528c 100644
--- a/packages/mobile/ios/Quiet/Info.plist
+++ b/packages/mobile/ios/Quiet/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>319</string>
+	<string>320</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>
diff --git a/packages/mobile/ios/Quiet/LaunchScreen.storyboard b/packages/mobile/ios/Quiet/LaunchScreen.storyboard
index f8a1324dfe..6cebfec80c 100644
--- a/packages/mobile/ios/Quiet/LaunchScreen.storyboard
+++ b/packages/mobile/ios/Quiet/LaunchScreen.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -12,29 +13,20 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Quiet" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="180" width="600" height="43"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="MN2-I3-ftu">
-                                <rect key="frame" x="0.0" y="559" width="600" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="xwn-Hh-Z4Y">
+                                <rect key="frame" x="125" y="59" width="143" height="759"/>
+                            </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="MN2-I3-ftu" secondAttribute="bottom" constant="20" id="OZV-Vh-mqD"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
-                            <constraint firstItem="MN2-I3-ftu" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="akx-eg-2ui"/>
-                            <constraint firstItem="MN2-I3-ftu" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="i1E-0Y-4RG"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="xwn-Hh-Z4Y" secondAttribute="trailing" constant="125" id="DLd-5L-f6a"/>
+                            <constraint firstItem="xwn-Hh-Z4Y" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="125" id="RDy-3e-d1g"/>
+                            <constraint firstItem="xwn-Hh-Z4Y" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" id="hAM-Zh-xEb"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="xwn-Hh-Z4Y" secondAttribute="bottom" id="jTe-xD-OhY"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -44,8 +36,6 @@
         </scene>
     </scenes>
     <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
+        <image name="Logo" width="544" height="544"/>
     </resources>
 </document>
diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
index 023baa730b..6c2a759b1b 100644
--- a/packages/mobile/ios/QuietTests/Info.plist
+++ b/packages/mobile/ios/QuietTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>319</string>
+	<string>320</string>
 </dict>
 </plist>
diff --git a/packages/mobile/ios/ci.plist b/packages/mobile/ios/ci.plist
index 0be32b9ccd..e340410172 100644
--- a/packages/mobile/ios/ci.plist
+++ b/packages/mobile/ios/ci.plist
@@ -11,5 +11,7 @@
         <key>com.quietmobile</key>
         <string>match AppStore com.quietmobile</string>
     </dict>
+    <key>uploadSymbols</key>
+    <false/>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 87ed3cd1d4..d9be3397f9 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "2.0.0-alpha.21",
+      "version": "2.0.1-alpha.2",
       "dependencies": {
         "@peculiar/webcrypto": "^1.4.3",
         "@react-native-clipboard/clipboard": "^1.11.2",
@@ -98,6 +98,7 @@
         "react-native-version": "^4.0.0",
         "react-test-renderer": "18.1.0",
         "redux-saga-test-plan": "^4.0.1",
+        "run-script-os": "1.1.6",
         "socket.io-mock": "^1.3.2",
         "typescript": "^4.9.3",
         "wait-for-expect": "^3.0.2"
@@ -22419,6 +22420,16 @@
         "aproba": "^1.1.1"
       }
     },
+    "node_modules/run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true,
+      "bin": {
+        "run-os": "index.js",
+        "run-script-os": "index.js"
+      }
+    },
     "node_modules/rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -43253,6 +43264,12 @@
         "aproba": "^1.1.1"
       }
     },
+    "run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "dev": true
+    },
     "rxjs": {
       "version": "6.6.7",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index fc04064760..a27a3efa0b 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.1-alpha.2",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug",
@@ -12,21 +12,27 @@
     "lint": "eslint --ext .jsx,.js,.ts,.tsx ./src/ --fix",
     "lint-ci": "eslint --ext .jsx,.js,.ts,.tsx ./src/",
     "gen": "plop",
-    "prepare-backend-assets": "mkdir -p ./nodejs-assets/nodejs-project && cp ../backend/lib/bundle.cjs ./nodejs-assets/nodejs-project/bundle.cjs",
+    "prepare-backend-assets": "run-script-os",
+    "prepare-backend-assets:default": "mkdir -p ./nodejs-assets/nodejs-project && cp ../backend/lib/bundle.cjs ./nodejs-assets/nodejs-project/bundle.cjs",
+    "prepare-backend-assets:windows": "mkdir .\\nodejs-assets\\nodejs-project || cd . && xcopy ..\\backend\\lib\\bundle.cjs .\\nodejs-assets\\nodejs-project\\ /Y",
     "patch-state-manager": "node -e \"if (process.env.NODE_ENV !== 'production'){process.exit(1)} \" || patch -f -d ../state-manager -p0 < ./factory-girl.patch || true",
     "patch-react-native": "patch -f -p0 --forward --binary < ./react-native.patch || true",
     "patch-webview-crypto": "patch -f -p0 --forward --binary < ./react-native-webview-crypto.patch || true",
-    "override-dlopen": "cd ./nodejs-assets/nodejs-project && cp ../override-dlopen-paths-preload.js ./ && cp ../override-dlopen-paths-data.json ./",
-    "prepare": "npm run prepare-backend-assets && npm run override-dlopen && npm run patch-state-manager && npm run patch-react-native && npm run patch-webview-crypto && npm run build",
+    "override-dlopen": "run-script-os",
+    "override-dlopen:default": "cd ./nodejs-assets/nodejs-project && cp ../override-dlopen-paths-preload.js ./ && cp ../override-dlopen-paths-data.json ./",
+    "override-dlopen:windows": "cd ./nodejs-assets/nodejs-project && xcopy ..\\override-dlopen-paths-preload.js .\\ /Y && xcopy ..\\override-dlopen-paths-data.json .\\ /Y",
+    "prepare": "run-script-os",
+    "prepare:default": "npm run prepare-backend-assets && npm run override-dlopen && npm run patch-state-manager && npm run patch-react-native && npm run patch-webview-crypto && npm run build",
+    "prepare:windows": "npm run prepare-backend-assets && npm run override-dlopen && npm run build",
     "version": "react-native-version --skip-tag"
   },
   "dependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@quiet/backend": "^2.0.0-alpha.20",
-    "@quiet/common": "^2.0.0-alpha.18",
-    "@quiet/identity": "^2.0.0-alpha.18",
-    "@quiet/state-manager": "^2.0.0-alpha.18",
-    "@quiet/types": "^2.0.0-alpha.18",
+    "@quiet/backend": "^2.0.1-alpha.2",
+    "@quiet/common": "^2.0.1-alpha.2",
+    "@quiet/identity": "^2.0.1-alpha.2",
+    "@quiet/state-manager": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.2",
     "@react-native-clipboard/clipboard": "^1.11.2",
     "@react-navigation/native": "^6.0.0",
     "@react-navigation/native-stack": "^6.9.0",
@@ -82,7 +88,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/runtime": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@react-native-async-storage/async-storage": "^1.18.1",
     "@react-native-community/eslint-config": "^2.0.0",
     "@react-native-community/push-notification-ios": "^1.10.1",
@@ -117,6 +123,7 @@
     "react-native-version": "^4.0.0",
     "react-test-renderer": "18.1.0",
     "redux-saga-test-plan": "^4.0.1",
+    "run-script-os": "1.1.6",
     "socket.io-mock": "^1.3.2",
     "typescript": "^4.9.3",
     "wait-for-expect": "^3.0.2"
diff --git a/packages/mobile/src/App.tsx b/packages/mobile/src/App.tsx
index c8d477d2e5..49b1e7019d 100644
--- a/packages/mobile/src/App.tsx
+++ b/packages/mobile/src/App.tsx
@@ -46,6 +46,9 @@ import { RootStackParamList } from './route.params'
 import ConnectionProcessScreen from './screens/ConnectionProcess/ConnectionProcess.screen'
 import { DuplicatedUsernameScreen } from './screens/DuplicatedUsername/DuplicatedUsername.screen'
 import { UnregisteredUsernameScreen } from './screens/UnregisteredUsername/UnregisteredUsername.screen'
+import UsernameTakenScreen from './screens/UsernameTaken/UsernameTaken.screen'
+import NewUsernameRequestedScreen from './screens/NewUsernameRequested/NewUsernameRequested.screen'
+import { PossibleImpersonationAttackScreen } from './screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen'
 
 LogBox.ignoreAllLogs()
 
@@ -103,6 +106,12 @@ function App(): JSX.Element {
                 <Screen component={ErrorScreen} name={ScreenNames.ErrorScreen} />
                 <Screen component={DuplicatedUsernameScreen} name={ScreenNames.DuplicatedUsernameScreen} />
                 <Screen component={UnregisteredUsernameScreen} name={ScreenNames.UnregisteredUsernameScreen} />
+                <Screen component={UsernameTakenScreen} name={ScreenNames.UsernameTakenScreen} />
+                <Screen component={NewUsernameRequestedScreen} name={ScreenNames.NewUsernameRequestedScreen} />
+                <Screen
+                  component={PossibleImpersonationAttackScreen}
+                  name={ScreenNames.PossibleImpersonationAttackScreen}
+                />
               </Navigator>
               <CommunityContextMenu />
               <ChannelContextMenu />
diff --git a/packages/mobile/src/assets.ts b/packages/mobile/src/assets.ts
index 5dcceb57ca..b2d5be2dac 100644
--- a/packages/mobile/src/assets.ts
+++ b/packages/mobile/src/assets.ts
@@ -12,7 +12,7 @@ import icon_warning from '../assets/icons/icon_warning.png'
 import icon_close from '../assets/icons/icon_close.png'
 import file_document from '../assets/icons/file_document.png'
 import dots from '../assets/icons/dots.png'
-import paperclip_active from '../assets/icons/paperclip_black.png'
+import paperclip_gray from '../assets/icons/paperclip_gray.png'
 
 /**
  * @description This assets are for the app.
@@ -32,7 +32,7 @@ export const appImages = {
   icon_close,
   file_document,
   dots,
-  paperclip_active,
+  paperclip_gray,
 }
 
 /**
diff --git a/packages/mobile/src/components/AttachmentButton/AttachmentButton.component.tsx b/packages/mobile/src/components/AttachmentButton/AttachmentButton.component.tsx
index 753dfcd74e..f1e51928e8 100644
--- a/packages/mobile/src/components/AttachmentButton/AttachmentButton.component.tsx
+++ b/packages/mobile/src/components/AttachmentButton/AttachmentButton.component.tsx
@@ -1,11 +1,10 @@
 import React, { FC, useCallback } from 'react'
 import { TouchableWithoutFeedback, View, Image } from 'react-native'
 import { appImages } from '../../assets'
-
 import { AttachmentButtonProps } from './AttachmentButton.types'
 
 export const AttachmentButton: FC<AttachmentButtonProps> = ({ onPress }) => {
-  const icon = appImages.paperclip_active
+  const icon = appImages.paperclip_gray
 
   return (
     <TouchableWithoutFeedback onPress={onPress} testID={'attach_file_button'}>
@@ -20,8 +19,8 @@ export const AttachmentButton: FC<AttachmentButtonProps> = ({ onPress }) => {
           source={icon}
           style={{
             alignSelf: 'center',
-            width: 20,
-            height: 20,
+            width: 24,
+            height: 24,
           }}
         />
       </View>
diff --git a/packages/mobile/src/components/AttachmentButton/AttachmentButton.test.tsx b/packages/mobile/src/components/AttachmentButton/AttachmentButton.test.tsx
index c4b7b64503..8ecc10dd9d 100644
--- a/packages/mobile/src/components/AttachmentButton/AttachmentButton.test.tsx
+++ b/packages/mobile/src/components/AttachmentButton/AttachmentButton.test.tsx
@@ -39,14 +39,14 @@ describe('Attachment button component', () => {
         <Image
           source={
             {
-              "testUri": "../../../assets/icons/paperclip_black.png",
+              "testUri": "../../../assets/icons/paperclip_gray.png",
             }
           }
           style={
             {
               "alignSelf": "center",
-              "height": 20,
-              "width": 20,
+              "height": 24,
+              "width": 24,
             }
           }
         />
diff --git a/packages/mobile/src/components/Button/Button.component.tsx b/packages/mobile/src/components/Button/Button.component.tsx
index 74d41649b2..9c9fc97999 100644
--- a/packages/mobile/src/components/Button/Button.component.tsx
+++ b/packages/mobile/src/components/Button/Button.component.tsx
@@ -18,8 +18,8 @@ export const Button: FC<ButtonProps> = ({ onPress, title, width, loading, negati
         style={{
           paddingVertical: 12,
           marginVertical: !negative ? 12 : 0,
-          backgroundColor: !negative ? defaultTheme.palette.main.brand : 'transparent',
-          borderRadius: 5,
+          backgroundColor: disabled ? 'grey' : !negative ? defaultTheme.palette.main.brand : 'transparent',
+          borderRadius: 8,
           justifyContent: 'center',
           alignItems: 'center',
           minHeight: 45,
diff --git a/packages/mobile/src/components/ChannelList/ChannelList.component.tsx b/packages/mobile/src/components/ChannelList/ChannelList.component.tsx
index 00022fb9eb..bed7d94178 100644
--- a/packages/mobile/src/components/ChannelList/ChannelList.component.tsx
+++ b/packages/mobile/src/components/ChannelList/ChannelList.component.tsx
@@ -8,7 +8,7 @@ import { Spinner } from '../Spinner/Spinner.component'
 import { capitalizeFirstLetter } from '@quiet/common'
 
 export const ChannelList: FC<ChannelListProps> = ({ community, tiles, communityContextMenu }) => {
-  let communityName = ''
+  let communityName = '...'
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)
   }
diff --git a/packages/mobile/src/components/Chat/Chat.component.tsx b/packages/mobile/src/components/Chat/Chat.component.tsx
index ccabf7c5d4..ab83720800 100644
--- a/packages/mobile/src/components/Chat/Chat.component.tsx
+++ b/packages/mobile/src/components/Chat/Chat.component.tsx
@@ -2,17 +2,17 @@ import React, { FC, useRef, useState, useEffect, useCallback } from 'react'
 import { Keyboard, View, FlatList, TextInput, KeyboardAvoidingView, Platform } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Appbar } from '../../components/Appbar/Appbar.component'
+import { Loading } from '../Loading/Loading.component'
 import { ImagePreviewModal } from '../../components/ImagePreview/ImagePreview.component'
-import { Spinner } from '../Spinner/Spinner.component'
 import { Message } from '../Message/Message.component'
 import { Input } from '../Input/Input.component'
 import { MessageSendButton } from '../MessageSendButton/MessageSendButton.component'
 import { ChannelMessagesComponentProps, ChatProps } from './Chat.types'
 import { FileActionsProps } from '../UploadedFile/UploadedFile.types'
-import { defaultTheme } from '../../styles/themes/default.theme'
 import { AttachmentButton } from '../AttachmentButton/AttachmentButton.component'
 import DocumentPicker, { DocumentPickerResponse, types } from 'react-native-document-picker'
 import UploadFilesPreviewsComponent from '../FileUploadingPreview/UploadingPreview.component'
+import { defaultTheme } from '../../styles/themes/default.theme'
 
 export const Chat: FC<ChatProps & FileActionsProps> = ({
   contextMenu,
@@ -145,73 +145,79 @@ export const Chat: FC<ChatProps & FileActionsProps> = ({
         }}
       >
         {messages.count === 0 ? (
-          <Spinner description='Loading messages' />
+          <Loading title={'Loading messages'} caption={'Chat will become available shortly'} />
         ) : (
-          <FlatList
-            // There's a performance issue with inverted prop on FlatList, so we're double rotating the elements as a workaround
-            // https://github.com/facebook/react-native/issues/30034
-            style={{
-              transform: [{ rotate: '180deg' }],
-              paddingLeft: defaultPadding,
-              paddingRight: defaultPadding,
-            }}
-            data={Object.keys(messages.groups).reverse()}
-            keyExtractor={item => item}
-            renderItem={item => {
-              return <View style={{ transform: [{ rotate: '180deg' }] }}>{renderItem(item)}</View>
-            }}
-            onEndReached={() => {
-              loadMessagesAction(true)
-            }}
-            onEndReachedThreshold={0.7}
-            showsVerticalScrollIndicator={false}
-          />
-        )}
-        <View
-          style={{
-            flexDirection: 'row',
-            paddingBottom: Platform.select({ ios: 20, android: 0 }),
-          }}
-        >
-          <View
-            style={{
-              width: '100%',
-              paddingLeft: defaultPadding,
-              paddingRight: 0,
-            }}
-          >
+          <>
+            <FlatList
+              // There's a performance issue with inverted prop on FlatList, so we're double rotating the elements as a workaround
+              // https://github.com/facebook/react-native/issues/30034
+              style={{
+                transform: [{ rotate: '180deg' }],
+                paddingLeft: defaultPadding,
+                paddingRight: defaultPadding,
+              }}
+              data={Object.keys(messages.groups).reverse()}
+              keyExtractor={item => item}
+              renderItem={item => {
+                return <View style={{ transform: [{ rotate: '180deg' }] }}>{renderItem(item)}</View>
+              }}
+              onEndReached={() => {
+                loadMessagesAction(true)
+              }}
+              onEndReachedThreshold={0.7}
+              showsVerticalScrollIndicator={false}
+            />
             <View
               style={{
                 flexDirection: 'row',
-                width: '100%',
+                paddingBottom: Platform.select({ ios: 20, android: 0 }),
               }}
             >
-              <Input
-                ref={messageInputRef}
-                onChangeText={onInputTextChange}
-                placeholder={`Message #${channel?.name}`}
-                multiline={true}
-                wrapperStyle={{ width: didKeyboardShow || areFilesUploaded ? '75%' : '85%' }}
-              />
               <View
                 style={{
-                  paddingLeft: 10,
-                  paddingRight: 10,
-                  gap: 5,
-                  flexDirection: 'row',
-                  width: didKeyboardShow || areFilesUploaded ? '25%' : '15%',
+                  width: '100%',
+                  paddingLeft: defaultPadding,
+                  paddingRight: !didKeyboardShow && !areFilesUploaded ? defaultPadding : 0,
                 }}
               >
-                <AttachmentButton onPress={openAttachments} />
-                {(didKeyboardShow || areFilesUploaded) && (
-                  <MessageSendButton onPress={onPress} disabled={shouldDisableSubmit} />
+                <View
+                  style={{
+                    flexDirection: 'row',
+                  }}
+                >
+                  <View style={{ flex: 1 }}>
+                    <View style={{ justifyContent: 'center' }}>
+                      <Input
+                        ref={messageInputRef}
+                        onChangeText={onInputTextChange}
+                        placeholder={`Message #${channel?.name}`}
+                        multiline={true}
+                        style={{ paddingRight: 50 }}
+                        round
+                      />
+                    </View>
+                    <View
+                      style={{
+                        position: 'absolute',
+                        height: '100%',
+                        right: 10,
+                        justifyContent: 'center',
+                      }}
+                    >
+                      <AttachmentButton onPress={openAttachments} />
+                    </View>
+                  </View>
+                  {(didKeyboardShow || areFilesUploaded) && (
+                    <MessageSendButton onPress={onPress} disabled={shouldDisableSubmit} />
+                  )}
+                </View>
+                {uploadedFiles && (
+                  <UploadFilesPreviewsComponent filesData={uploadedFiles} removeFile={removeFilePreview} />
                 )}
               </View>
             </View>
-
-            {uploadedFiles && <UploadFilesPreviewsComponent filesData={uploadedFiles} removeFile={removeFilePreview} />}
-          </View>
-        </View>
+          </>
+        )}
       </KeyboardAvoidingView>
       {imagePreview && setImagePreview && (
         <ImagePreviewModal
diff --git a/packages/mobile/src/components/Chat/__tests__/__snapshots__/Chat.test.tsx.snap b/packages/mobile/src/components/Chat/__tests__/__snapshots__/Chat.test.tsx.snap
index 9c5d659a56..a87707ba43 100644
--- a/packages/mobile/src/components/Chat/__tests__/__snapshots__/Chat.test.tsx.snap
+++ b/packages/mobile/src/components/Chat/__tests__/__snapshots__/Chat.test.tsx.snap
@@ -2830,7 +2830,7 @@ exports[`Chat component renders component 1`] = `
         style={
           {
             "paddingLeft": 20,
-            "paddingRight": 0,
+            "paddingRight": 20,
             "width": "100%",
           }
         }
@@ -2839,134 +2839,150 @@ exports[`Chat component renders component 1`] = `
           style={
             {
               "flexDirection": "row",
-              "width": "100%",
             }
           }
         >
           <View
             style={
               {
-                "width": "85%",
+                "flex": 1,
               }
             }
           >
             <View
-              accessibilityState={
-                {
-                  "busy": undefined,
-                  "checked": undefined,
-                  "disabled": false,
-                  "expanded": undefined,
-                  "selected": undefined,
-                }
-              }
-              accessibilityValue={
+              style={
                 {
-                  "max": undefined,
-                  "min": undefined,
-                  "now": undefined,
-                  "text": undefined,
+                  "justifyContent": "center",
                 }
               }
-              accessible={true}
-              collapsable={false}
-              focusable={true}
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              onResponderGrant={[Function]}
-              onResponderMove={[Function]}
-              onResponderRelease={[Function]}
-              onResponderTerminate={[Function]}
-              onResponderTerminationRequest={[Function]}
-              onStartShouldSetResponder={[Function]}
-              style={
-                [
-                  {
-                    "backgroundColor": "#ffffff",
-                    "borderColor": "#B3B3B3",
-                    "borderRadius": 4,
-                    "borderWidth": 1,
-                    "flexGrow": 1,
-                    "height": 60,
-                    "justifyContent": "center",
-                    "paddingLeft": 15,
-                    "paddingRight": 15,
-                  },
-                ]
-              }
             >
-              <TextInput
-                editable={true}
-                multiline={true}
-                onChangeText={[Function]}
-                placeholder="Message #general"
-                style={
-                  [
+              <View>
+                <View
+                  accessibilityState={
                     {
-                      "paddingBottom": 12,
-                      "paddingTop": 12,
-                      "textAlignVertical": "center",
-                    },
-                  ]
-                }
-                testID="input"
-              />
+                      "busy": undefined,
+                      "checked": undefined,
+                      "disabled": false,
+                      "expanded": undefined,
+                      "selected": undefined,
+                    }
+                  }
+                  accessibilityValue={
+                    {
+                      "max": undefined,
+                      "min": undefined,
+                      "now": undefined,
+                      "text": undefined,
+                    }
+                  }
+                  accessible={true}
+                  collapsable={false}
+                  focusable={true}
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onResponderGrant={[Function]}
+                  onResponderMove={[Function]}
+                  onResponderRelease={[Function]}
+                  onResponderTerminate={[Function]}
+                  onResponderTerminationRequest={[Function]}
+                  onStartShouldSetResponder={[Function]}
+                  round={true}
+                  style={
+                    [
+                      {
+                        "backgroundColor": "#ffffff",
+                        "borderColor": "#C4C4C4",
+                        "borderRadius": 16,
+                        "borderWidth": 1,
+                        "flexGrow": 1,
+                        "height": 56,
+                        "justifyContent": "center",
+                        "paddingLeft": 16,
+                        "paddingRight": 16,
+                      },
+                      {
+                        "height": 74,
+                        "paddingRight": 50,
+                      },
+                    ]
+                  }
+                >
+                  <TextInput
+                    editable={true}
+                    height={54}
+                    multiline={true}
+                    onChangeText={[Function]}
+                    onContentSizeChange={[Function]}
+                    placeholder="Message #general"
+                    style={
+                      [
+                        {
+                          "height": 54,
+                          "paddingBottom": 0,
+                          "paddingTop": 12,
+                          "textAlignVertical": "center",
+                        },
+                      ]
+                    }
+                    testID="input"
+                  />
+                </View>
+              </View>
             </View>
-          </View>
-          <View
-            style={
-              {
-                "flexDirection": "row",
-                "gap": 5,
-                "paddingLeft": 10,
-                "paddingRight": 10,
-                "width": "15%",
-              }
-            }
-          >
             <View
-              accessibilityState={
-                {
-                  "busy": undefined,
-                  "checked": undefined,
-                  "disabled": undefined,
-                  "expanded": undefined,
-                  "selected": undefined,
-                }
-              }
-              accessible={true}
-              focusable={true}
-              onClick={[Function]}
-              onResponderGrant={[Function]}
-              onResponderMove={[Function]}
-              onResponderRelease={[Function]}
-              onResponderTerminate={[Function]}
-              onResponderTerminationRequest={[Function]}
-              onStartShouldSetResponder={[Function]}
               style={
                 {
+                  "height": "100%",
                   "justifyContent": "center",
-                  "paddingLeft": 5,
-                  "paddingRight": 5,
+                  "position": "absolute",
+                  "right": 10,
                 }
               }
-              testID="attach_file_button"
             >
-              <Image
-                source={
+              <View
+                accessibilityState={
                   {
-                    "testUri": "../../../assets/icons/paperclip_black.png",
+                    "busy": undefined,
+                    "checked": undefined,
+                    "disabled": undefined,
+                    "expanded": undefined,
+                    "selected": undefined,
                   }
                 }
+                accessible={true}
+                focusable={true}
+                onClick={[Function]}
+                onResponderGrant={[Function]}
+                onResponderMove={[Function]}
+                onResponderRelease={[Function]}
+                onResponderTerminate={[Function]}
+                onResponderTerminationRequest={[Function]}
+                onStartShouldSetResponder={[Function]}
                 style={
                   {
-                    "alignSelf": "center",
-                    "height": 20,
-                    "width": 20,
+                    "justifyContent": "center",
+                    "paddingLeft": 5,
+                    "paddingRight": 5,
                   }
                 }
-              />
+                testID="attach_file_button"
+              >
+                <Image
+                  source={
+                    {
+                      "testUri": "../../../assets/icons/paperclip_gray.png",
+                    }
+                  }
+                  style={
+                    {
+                      "alignSelf": "center",
+                      "height": 24,
+                      "width": 24,
+                    }
+                  }
+                />
+              </View>
             </View>
           </View>
         </View>
diff --git a/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx b/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx
index cb326eb93b..8761d8a068 100644
--- a/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx
+++ b/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx
@@ -22,7 +22,7 @@ export const CommunityContextMenu: FC = () => {
 
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let title = ''
+  let title = '...'
   if (community?.name) {
     title = capitalizeFirstLetter(community.name)
   }
diff --git a/packages/mobile/src/components/CreateCommunity/CreateCommunity.component.tsx b/packages/mobile/src/components/CreateCommunity/CreateCommunity.component.tsx
index 0d42a2c11a..3c3e700742 100644
--- a/packages/mobile/src/components/CreateCommunity/CreateCommunity.component.tsx
+++ b/packages/mobile/src/components/CreateCommunity/CreateCommunity.component.tsx
@@ -7,7 +7,7 @@ import { Typography } from '../Typography/Typography.component'
 import { TextWithLink } from '../TextWithLink/TextWithLink.component'
 
 import { CreateCommunityProps } from './CreateCommunity.types'
-import { Loading } from '../Loading/Loading.component'
+import { Splash } from '../Splash/Splash.component'
 
 export const CreateCommunity: FC<CreateCommunityProps> = ({
   createCommunityAction,
@@ -91,7 +91,7 @@ export const CreateCommunity: FC<CreateCommunityProps> = ({
           </KeyboardAvoidingView>
         </View>
       ) : (
-        <Loading />
+        <Splash />
       )}
     </>
   )
diff --git a/packages/mobile/src/components/CreateCommunity/__tests__/__snapshots__/CreateCommunity.test.tsx.snap b/packages/mobile/src/components/CreateCommunity/__tests__/__snapshots__/CreateCommunity.test.tsx.snap
index 440ebbd134..18c2a3abc0 100644
--- a/packages/mobile/src/components/CreateCommunity/__tests__/__snapshots__/CreateCommunity.test.tsx.snap
+++ b/packages/mobile/src/components/CreateCommunity/__tests__/__snapshots__/CreateCommunity.test.tsx.snap
@@ -98,29 +98,36 @@ exports[`Spinner component renders component 1`] = `
         onResponderTerminate={[Function]}
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
+        round={false}
         style={
           [
             {
               "backgroundColor": "#ffffff",
-              "borderColor": "#B3B3B3",
+              "borderColor": "#C4C4C4",
               "borderRadius": 4,
               "borderWidth": 1,
               "flexGrow": 1,
-              "height": 60,
+              "height": 56,
               "justifyContent": "center",
-              "paddingLeft": 15,
-              "paddingRight": 15,
+              "paddingLeft": 16,
+              "paddingRight": 16,
+            },
+            {
+              "height": 54,
             },
           ]
         }
       >
         <TextInput
           editable={true}
+          height={54}
           onChangeText={[Function]}
+          onContentSizeChange={[Function]}
           placeholder="Community name"
           style={
             [
               {
+                "height": 54,
                 "paddingBottom": 12,
                 "paddingTop": 12,
                 "textAlignVertical": "center",
@@ -334,7 +341,7 @@ exports[`Spinner component renders component 1`] = `
           {
             "alignItems": "center",
             "backgroundColor": "#521C74",
-            "borderRadius": 5,
+            "borderRadius": 8,
             "justifyContent": "center",
             "marginVertical": 12,
             "minHeight": 45,
diff --git a/packages/mobile/src/components/DeleteChannel/DeleteChannel.test.tsx b/packages/mobile/src/components/DeleteChannel/DeleteChannel.test.tsx
index 4089beca3b..f7551148a2 100644
--- a/packages/mobile/src/components/DeleteChannel/DeleteChannel.test.tsx
+++ b/packages/mobile/src/components/DeleteChannel/DeleteChannel.test.tsx
@@ -253,7 +253,7 @@ describe('DeleteChannel component', () => {
                 {
                   "alignItems": "center",
                   "backgroundColor": "#521C74",
-                  "borderRadius": 5,
+                  "borderRadius": 8,
                   "justifyContent": "center",
                   "marginVertical": 12,
                   "minHeight": 45,
@@ -308,7 +308,7 @@ describe('DeleteChannel component', () => {
                 {
                   "alignItems": "center",
                   "backgroundColor": "transparent",
-                  "borderRadius": 5,
+                  "borderRadius": 8,
                   "justifyContent": "center",
                   "marginVertical": 0,
                   "minHeight": 45,
diff --git a/packages/mobile/src/components/Input/Input.component.tsx b/packages/mobile/src/components/Input/Input.component.tsx
index 26e456707c..8d8acd73b3 100644
--- a/packages/mobile/src/components/Input/Input.component.tsx
+++ b/packages/mobile/src/components/Input/Input.component.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, forwardRef } from 'react'
+import React, { useCallback, useRef, forwardRef, useState } from 'react'
 import { TextInput, View } from 'react-native'
 import { Typography } from '../Typography/Typography.component'
 
@@ -18,12 +18,15 @@ export const Input = forwardRef<TextInput, InputProps>(
       hint,
       multiline,
       disabled = false,
+      round = false,
       style,
       wrapperStyle,
       children,
     },
     ref
   ) => {
+    const [height, setHeight] = useState(54)
+
     const textInputRef = useRef<null | TextInput>(null)
 
     const handleViewPress = useCallback(() => {
@@ -39,15 +42,29 @@ export const Input = forwardRef<TextInput, InputProps>(
             {label}
           </Typography>
         )}
-        <StyledWrapper onPress={handleViewPress} disabled={disabled} style={style}>
+        <StyledWrapper
+          onPress={handleViewPress}
+          disabled={disabled}
+          round={round}
+          style={{
+            height: multiline ? Math.max(54, height + 20) : 54,
+            ...style,
+          }}
+        >
           <StyledTextInput
             onChangeText={onChangeText}
+            onContentSizeChange={event => {
+              if (multiline) {
+                setHeight(event.nativeEvent.contentSize.height)
+              }
+            }}
             ref={(instance: TextInput | null) => {
               textInputRef.current = instance
               if (ref !== null && 'current' in ref) {
                 ref.current = instance
               }
             }}
+            height={height}
             multiline={multiline}
             editable={!disabled}
             placeholder={placeholder}
@@ -63,7 +80,7 @@ export const Input = forwardRef<TextInput, InputProps>(
           </Typography>
         )}
         {hint && (
-          <Typography fontSize={10} color={'hint'} style={{ paddingTop: 10 }}>
+          <Typography fontSize={10} color={'hint'} style={{ paddingTop: 10, lineHeight: 16 }}>
             {hint}
           </Typography>
         )}
diff --git a/packages/mobile/src/components/Input/Input.styles.ts b/packages/mobile/src/components/Input/Input.styles.ts
index e2c0172176..08ad3f9b62 100644
--- a/packages/mobile/src/components/Input/Input.styles.ts
+++ b/packages/mobile/src/components/Input/Input.styles.ts
@@ -2,30 +2,37 @@ import { Platform, Pressable, TextInput } from 'react-native'
 import styled, { css } from 'styled-components/native'
 import { defaultTheme } from '../../styles/themes/default.theme'
 
-export const StyledTextInput = styled(TextInput)`
-  text-align-vertical: center;
-  ${Platform.select({
-    ios: {
-      paddingTop: 12,
-      paddingBottom: 12,
-    },
-    android: {},
-  })}
+export const StyledTextInput = styled(TextInput)<{
+  height: number
+  multiline?: boolean
+}>`
+  ${({ height, multiline }) => css`
+    text-align-vertical: center;
+    height: ${Math.max(40, height)};
+    ${Platform.select({
+      ios: {
+        paddingTop: 12,
+        paddingBottom: multiline ? 0 : 12,
+      },
+      android: {},
+    })}
+  `}
 `
 
 export const StyledWrapper = styled(Pressable)<{
   disabled: boolean
+  round: boolean
 }>`
-  ${({ disabled }) => css`
+  ${({ disabled, round }) => css`
     background-color: ${disabled
       ? defaultTheme.palette.input.backgroundDisabled
       : defaultTheme.palette.input.backgroundDefault};
     border-color: ${defaultTheme.palette.input.border};
-    border-radius: 4px;
+    border-radius: ${round ? '16px' : '4px'};
     border-width: 1px;
-    padding-left: 15px;
-    padding-right: 15px;
-    height: 60px;
+    padding-left: 16px;
+    padding-right: 16px;
+    height: 56px;
     justify-content: center;
     flex-grow: 1;
   `}
diff --git a/packages/mobile/src/components/Input/Input.test.tsx b/packages/mobile/src/components/Input/Input.test.tsx
index 0a03ff0b09..8d2d248cc6 100644
--- a/packages/mobile/src/components/Input/Input.test.tsx
+++ b/packages/mobile/src/components/Input/Input.test.tsx
@@ -39,29 +39,36 @@ describe('MessageInput component', () => {
           onResponderTerminate={[Function]}
           onResponderTerminationRequest={[Function]}
           onStartShouldSetResponder={[Function]}
+          round={false}
           style={
             [
               {
                 "backgroundColor": "#ffffff",
-                "borderColor": "#B3B3B3",
+                "borderColor": "#C4C4C4",
                 "borderRadius": 4,
                 "borderWidth": 1,
                 "flexGrow": 1,
-                "height": 60,
+                "height": 56,
                 "justifyContent": "center",
-                "paddingLeft": 15,
-                "paddingRight": 15,
+                "paddingLeft": 16,
+                "paddingRight": 16,
+              },
+              {
+                "height": 54,
               },
             ]
           }
         >
           <TextInput
             editable={true}
+            height={54}
             onChangeText={[Function]}
+            onContentSizeChange={[Function]}
             placeholder="Message #general as @holmes"
             style={
               [
                 {
+                  "height": 54,
                   "paddingBottom": 12,
                   "paddingTop": 12,
                   "textAlignVertical": "center",
diff --git a/packages/mobile/src/components/Input/Input.types.ts b/packages/mobile/src/components/Input/Input.types.ts
index 5b6416486f..42c2811aac 100644
--- a/packages/mobile/src/components/Input/Input.types.ts
+++ b/packages/mobile/src/components/Input/Input.types.ts
@@ -11,6 +11,7 @@ export interface InputProps {
   hint?: string
   multiline?: boolean
   disabled?: boolean
+  round?: boolean
   style?: ViewStyle
   wrapperStyle?: ViewStyle
   children?: ReactElement
diff --git a/packages/mobile/src/components/JoinCommunity/JoinCommunity.component.tsx b/packages/mobile/src/components/JoinCommunity/JoinCommunity.component.tsx
index 9fcd084dbd..8aed5ac632 100644
--- a/packages/mobile/src/components/JoinCommunity/JoinCommunity.component.tsx
+++ b/packages/mobile/src/components/JoinCommunity/JoinCommunity.component.tsx
@@ -8,9 +8,8 @@ import { TextWithLink } from '../TextWithLink/TextWithLink.component'
 
 import { JoinCommunityProps } from './JoinCommunity.types'
 import { getInvitationCodes } from '@quiet/state-manager'
-import { ONION_ADDRESS_REGEX } from '@quiet/common'
 
-import { Loading } from '../Loading/Loading.component'
+import { Splash } from '../Splash/Splash.component'
 
 export const JoinCommunity: FC<JoinCommunityProps> = ({
   joinCommunityAction,
@@ -111,7 +110,7 @@ export const JoinCommunity: FC<JoinCommunityProps> = ({
           </KeyboardAvoidingView>
         </View>
       ) : (
-        <Loading />
+        <Splash />
       )}
     </>
   )
diff --git a/packages/mobile/src/components/JoinCommunity/__tests__/__snapshots__/JoinCommunity.test.tsx.snap b/packages/mobile/src/components/JoinCommunity/__tests__/__snapshots__/JoinCommunity.test.tsx.snap
index 8a83be2f7e..3334be786e 100644
--- a/packages/mobile/src/components/JoinCommunity/__tests__/__snapshots__/JoinCommunity.test.tsx.snap
+++ b/packages/mobile/src/components/JoinCommunity/__tests__/__snapshots__/JoinCommunity.test.tsx.snap
@@ -98,29 +98,36 @@ exports[`JoinCommunity component renders component 1`] = `
         onResponderTerminate={[Function]}
         onResponderTerminationRequest={[Function]}
         onStartShouldSetResponder={[Function]}
+        round={false}
         style={
           [
             {
               "backgroundColor": "#ffffff",
-              "borderColor": "#B3B3B3",
+              "borderColor": "#C4C4C4",
               "borderRadius": 4,
               "borderWidth": 1,
               "flexGrow": 1,
-              "height": 60,
+              "height": 56,
               "justifyContent": "center",
-              "paddingLeft": 15,
-              "paddingRight": 15,
+              "paddingLeft": 16,
+              "paddingRight": 16,
+            },
+            {
+              "height": 54,
             },
           ]
         }
       >
         <TextInput
           editable={true}
+          height={54}
           onChangeText={[Function]}
+          onContentSizeChange={[Function]}
           placeholder="Invite link"
           style={
             [
               {
+                "height": 54,
                 "paddingBottom": 12,
                 "paddingTop": 12,
                 "textAlignVertical": "center",
@@ -334,7 +341,7 @@ exports[`JoinCommunity component renders component 1`] = `
           {
             "alignItems": "center",
             "backgroundColor": "#521C74",
-            "borderRadius": 5,
+            "borderRadius": 8,
             "justifyContent": "center",
             "marginVertical": 12,
             "minHeight": 45,
diff --git a/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.component.tsx b/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.component.tsx
index 7a9f5948d4..a72511be1f 100644
--- a/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.component.tsx
+++ b/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.component.tsx
@@ -1,7 +1,6 @@
 import React, { FC, useEffect, useState } from 'react'
 import { View } from 'react-native'
 import { defaultPalette } from '../../styles/palettes/default.palette'
-
 import { Appbar } from '../Appbar/Appbar.component'
 import { Button } from '../Button/Button.component'
 import { Typography } from '../Typography/Typography.component'
diff --git a/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.test.tsx b/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.test.tsx
index 00841d0c7a..e9e7af485b 100644
--- a/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.test.tsx
+++ b/packages/mobile/src/components/LeaveCommunity/LeaveCommunity.test.tsx
@@ -252,7 +252,7 @@ describe('LeaveCommunity component', () => {
                 {
                   "alignItems": "center",
                   "backgroundColor": "#521C74",
-                  "borderRadius": 5,
+                  "borderRadius": 8,
                   "justifyContent": "center",
                   "marginVertical": 12,
                   "minHeight": 45,
@@ -307,7 +307,7 @@ describe('LeaveCommunity component', () => {
                 {
                   "alignItems": "center",
                   "backgroundColor": "transparent",
-                  "borderRadius": 5,
+                  "borderRadius": 8,
                   "justifyContent": "center",
                   "marginVertical": 0,
                   "minHeight": 45,
diff --git a/packages/mobile/src/components/Loading/Loading.component.test.tsx b/packages/mobile/src/components/Loading/Loading.component.test.tsx
new file mode 100644
index 0000000000..ddb936329b
--- /dev/null
+++ b/packages/mobile/src/components/Loading/Loading.component.test.tsx
@@ -0,0 +1,109 @@
+import React from 'react'
+import { renderComponent } from '../../utils/functions/renderComponent/renderComponent'
+
+import { Loading } from './Loading.component'
+
+describe('Loading component', () => {
+  it('should match inline snapshot', () => {
+    const { toJSON } = renderComponent(
+      <Loading
+        title={'Creating community “Disco-fever”'}
+        caption={'Additional info if needed can go here otherwise this is hidden.'}
+      />
+    )
+
+    expect(toJSON()).toMatchInlineSnapshot(`
+      <View
+        style={
+          {
+            "alignItems": "center",
+            "flex": 1,
+            "justifyContent": "center",
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "backgroundColor": "#F0F0F0",
+              "borderRadius": 4,
+              "height": 4,
+              "width": 300,
+            }
+          }
+        >
+          <View
+            style={
+              {
+                "backgroundColor": "#67BFD3",
+                "borderRadius": 4,
+                "height": 4,
+                "width": 220,
+              }
+            }
+          />
+        </View>
+        <View
+          style={
+            {
+              "flexDirection": "column",
+              "gap": 8,
+            }
+          }
+        >
+          <Text
+            color="main"
+            fontSize={14}
+            horizontalTextAlign="left"
+            style={
+              [
+                {
+                  "color": "#000000",
+                  "fontFamily": "Rubik-Regular",
+                  "fontSize": 14,
+                  "textAlign": "left",
+                  "textAlignVertical": "center",
+                },
+                {
+                  "lineHeight": 20,
+                  "marginTop": 8,
+                  "textAlign": "center",
+                },
+              ]
+            }
+            verticalTextAlign="center"
+          >
+            Creating community “Disco-fever”
+          </Text>
+          <View
+            style={
+              {
+                "width": 250,
+              }
+            }
+          >
+            <Text
+              color="gray50"
+              fontSize={12}
+              horizontalTextAlign="center"
+              style={
+                [
+                  {
+                    "color": "#7F7F7F",
+                    "fontFamily": "Rubik-Regular",
+                    "fontSize": 12,
+                    "textAlign": "center",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              Additional info if needed can go here otherwise this is hidden.
+            </Text>
+          </View>
+        </View>
+      </View>
+    `)
+  })
+})
diff --git a/packages/mobile/src/components/Loading/Loading.component.tsx b/packages/mobile/src/components/Loading/Loading.component.tsx
index 0c2a6f957a..1088fc0a67 100644
--- a/packages/mobile/src/components/Loading/Loading.component.tsx
+++ b/packages/mobile/src/components/Loading/Loading.component.tsx
@@ -1,44 +1,36 @@
 import React, { FC } from 'react'
-import { Image, View } from 'react-native'
-import deviceInfoModule from 'react-native-device-info'
+import { View } from 'react-native'
 import { Typography } from '../Typography/Typography.component'
-import { defaultTheme } from '../../styles/themes/default.theme'
-import { appImages } from '../../assets'
 
-export const Loading: FC = () => {
+export interface LoadingProps {
+  title: string
+  caption?: string
+  progress?: number
+}
+
+export const Loading: FC<LoadingProps> = ({ title, caption, progress = 220 }) => {
   return (
     <View
       style={{
         flex: 1,
-        alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: defaultTheme.palette.background.white,
+        alignItems: 'center',
       }}
-      testID='loading'
     >
-      <Image
-        source={appImages.quiet_icon}
-        style={{
-          marginTop: 20,
-          marginBottom: 46,
-          resizeMode: 'cover',
-          width: 84,
-          height: 84,
-          borderRadius: 16,
-        }}
-      />
-      <View style={{ gap: 6, alignItems: 'center' }}>
-        <Typography fontSize={14} fontWeight={'medium'}>
-          Starting backend
-        </Typography>
-        <Typography fontSize={12} color={'gray50'}>
-          This can take some time
-        </Typography>
+      <View style={{ width: 300, height: 4, backgroundColor: '#F0F0F0', borderRadius: 4 }}>
+        <View style={{ backgroundColor: '#67BFD3', height: 4, width: progress, borderRadius: 4 }}></View>
       </View>
-      <View style={{ margin: 20 }}>
-        <Typography fontSize={12} color={'grayDark'}>
-          {`v ${deviceInfoModule.getVersion()}`}
+      <View style={{ flexDirection: 'column', gap: 8 }}>
+        <Typography fontSize={14} style={{ lineHeight: 20, textAlign: 'center', marginTop: 8 }}>
+          {title}
         </Typography>
+        {caption && (
+          <View style={{ width: 250 }}>
+            <Typography fontSize={12} color={'gray50'} horizontalTextAlign={'center'}>
+              {caption}
+            </Typography>
+          </View>
+        )}
       </View>
     </View>
   )
diff --git a/packages/mobile/src/components/Loading/Loading.stories.tsx b/packages/mobile/src/components/Loading/Loading.stories.tsx
index d148245de0..f27ca84473 100644
--- a/packages/mobile/src/components/Loading/Loading.stories.tsx
+++ b/packages/mobile/src/components/Loading/Loading.stories.tsx
@@ -1,6 +1,11 @@
-import { storiesOf } from '@storybook/react-native'
 import React from 'react'
+import { storiesOf } from '@storybook/react-native'
 
 import { Loading } from './Loading.component'
 
-storiesOf('Loading', module).add('Default', () => <Loading />)
+storiesOf('Loading', module).add('Default', () => (
+  <Loading
+    title={'Creating community “Disco-fever”'}
+    caption={'Additional info if needed can go here otherwise this is hidden.'}
+  />
+))
diff --git a/packages/mobile/src/components/Message/Message.component.tsx b/packages/mobile/src/components/Message/Message.component.tsx
index 54127bd15a..faf4a56613 100644
--- a/packages/mobile/src/components/Message/Message.component.tsx
+++ b/packages/mobile/src/components/Message/Message.component.tsx
@@ -146,7 +146,7 @@ export const Message: FC<MessageProps & FileActionsProps> = ({
               </Typography>
             </View>
 
-            {userLabel && (
+            {userLabel && !info && (
               <View>
                 <UserLabel
                   username={representativeMessage.nickname}
diff --git a/packages/mobile/src/components/MessageSendButton/MessageSendButton.component.tsx b/packages/mobile/src/components/MessageSendButton/MessageSendButton.component.tsx
index 92dfae0708..1a59e990c6 100644
--- a/packages/mobile/src/components/MessageSendButton/MessageSendButton.component.tsx
+++ b/packages/mobile/src/components/MessageSendButton/MessageSendButton.component.tsx
@@ -17,8 +17,8 @@ export const MessageSendButton: FC<MessageSendButtonProps> = ({ onPress, disable
     <TouchableWithoutFeedback onPress={handlePress} testID={'send_message_button'}>
       <View
         style={{
-          paddingLeft: 5,
-          paddingRight: 5,
+          paddingLeft: 20,
+          paddingRight: 20,
           justifyContent: 'center',
         }}
       >
diff --git a/packages/mobile/src/components/MessageSendButton/MessageSendButton.test.tsx b/packages/mobile/src/components/MessageSendButton/MessageSendButton.test.tsx
index 74ec4df15d..92c34bd10a 100644
--- a/packages/mobile/src/components/MessageSendButton/MessageSendButton.test.tsx
+++ b/packages/mobile/src/components/MessageSendButton/MessageSendButton.test.tsx
@@ -30,8 +30,8 @@ describe('MessageSendButton component', () => {
         style={
           {
             "justifyContent": "center",
-            "paddingLeft": 5,
-            "paddingRight": 5,
+            "paddingLeft": 20,
+            "paddingRight": 20,
           }
         }
         testID="send_message_button"
diff --git a/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.component.tsx b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.component.tsx
new file mode 100644
index 0000000000..c7211d9a75
--- /dev/null
+++ b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.component.tsx
@@ -0,0 +1,29 @@
+import React from 'react'
+import { View } from 'react-native'
+import { Button } from '../Button/Button.component'
+import { Typography } from '../Typography/Typography.component'
+import { defaultTheme } from '../../styles/themes/default.theme'
+import { Appbar } from '../Appbar/Appbar.component'
+import { NewUsernameRequestedComponentProps } from '../../screens/NewUsernameRequested/NewUsernameRequested.types'
+
+const NewUsernameRequestedComponent: React.FC<NewUsernameRequestedComponentProps> = ({ handler }) => {
+  return (
+    <View
+      style={{
+        flex: 1,
+        backgroundColor: defaultTheme.palette.background.white,
+      }}
+      testID={'new-username-requested-component'}
+    >
+      <Appbar title={'Username taken'} crossBackIcon back={handler} />
+      <View style={{ paddingLeft: 20, paddingRight: 20 }}>
+        <Typography fontSize={14} style={{ marginTop: 30, marginBottom: 30 }}>
+          Great! Your new username should be registered automatically the next time the community owner is online.
+        </Typography>
+        <Button onPress={handler} title={'Continue'} width={100} />
+      </View>
+    </View>
+  )
+}
+
+export default NewUsernameRequestedComponent
diff --git a/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.stories.tsx b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.stories.tsx
new file mode 100644
index 0000000000..d09bb91591
--- /dev/null
+++ b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.stories.tsx
@@ -0,0 +1,8 @@
+import { storiesOf } from '@storybook/react-native'
+import React from 'react'
+import { storybookLog } from '../../utils/functions/storybookLog/storybookLog.function'
+import NewUsernameRequestedComponent from './NewUsernameRequested.component'
+
+storiesOf('NewUsernameRequested', module).add('Default', () => (
+  <NewUsernameRequestedComponent handler={storybookLog('clicked')} />
+))
diff --git a/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.test.tsx b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.test.tsx
new file mode 100644
index 0000000000..39b24436f0
--- /dev/null
+++ b/packages/mobile/src/components/NewUsernameRequested/NewUsernameRequested.test.tsx
@@ -0,0 +1,231 @@
+import React from 'react'
+import { renderComponent } from '../../utils/functions/renderComponent/renderComponent'
+import NewUsernameRequestedComponent from './NewUsernameRequested.component'
+
+describe('NewUsernameRequested component', () => {
+  it('should match inline snapshot', () => {
+    const { toJSON } = renderComponent(<NewUsernameRequestedComponent handler={jest.fn()} />)
+
+    expect(toJSON()).toMatchInlineSnapshot(`
+      <View
+        style={
+          {
+            "backgroundColor": "#ffffff",
+            "flex": 1,
+          }
+        }
+        testID="new-username-requested-component"
+      >
+        <View
+          style={
+            [
+              {
+                "alignItems": "center",
+                "backgroundColor": "#ffffff",
+                "borderBottomColor": "#F0F0F0",
+                "borderBottomWidth": 1,
+                "display": "flex",
+                "flexDirection": "row",
+                "justifyContent": "center",
+                "maxHeight": 52,
+                "minHeight": 52,
+              },
+            ]
+          }
+        >
+          <View
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          >
+            <View
+              accessibilityState={
+                {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
+                }
+              }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "opacity": 1,
+                }
+              }
+              testID="appbar_action_item"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "height": 50,
+                    "justifyContent": "center",
+                    "width": 64,
+                  }
+                }
+              >
+                <Image
+                  resizeMethod="resize"
+                  resizeMode="cover"
+                  source={
+                    {
+                      "testUri": "../../../assets/icons/icon_close.png",
+                    }
+                  }
+                  style={
+                    {
+                      "height": 16,
+                      "width": 16,
+                    }
+                  }
+                />
+              </View>
+            </View>
+          </View>
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "flex": 4,
+              }
+            }
+          >
+            <Text
+              color="main"
+              fontSize={16}
+              fontWeight="medium"
+              horizontalTextAlign="left"
+              style={
+                [
+                  {
+                    "color": "#000000",
+                    "fontFamily": "Rubik-Medium",
+                    "fontSize": 16,
+                    "textAlign": "left",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              Username taken
+            </Text>
+          </View>
+          <View
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          />
+        </View>
+        <View
+          style={
+            {
+              "paddingLeft": 20,
+              "paddingRight": 20,
+            }
+          }
+        >
+          <Text
+            color="main"
+            fontSize={14}
+            horizontalTextAlign="left"
+            style={
+              [
+                {
+                  "color": "#000000",
+                  "fontFamily": "Rubik-Regular",
+                  "fontSize": 14,
+                  "textAlign": "left",
+                  "textAlignVertical": "center",
+                },
+                {
+                  "marginBottom": 30,
+                  "marginTop": 30,
+                },
+              ]
+            }
+            verticalTextAlign="center"
+          >
+            Great! Your new username should be registered automatically the next time the community owner is online.
+          </Text>
+          <View
+            accessibilityState={
+              {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
+            }
+            accessible={true}
+            focusable={true}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#521C74",
+                "borderRadius": 8,
+                "justifyContent": "center",
+                "marginVertical": 12,
+                "minHeight": 45,
+                "paddingVertical": 12,
+                "width": 100,
+              }
+            }
+            testID="button"
+          >
+            <Text
+              color="white"
+              fontSize={14}
+              horizontalTextAlign="left"
+              style={
+                [
+                  {
+                    "color": "#ffffff",
+                    "fontFamily": "Rubik-Regular",
+                    "fontSize": 14,
+                    "textAlign": "left",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              Continue
+            </Text>
+          </View>
+        </View>
+      </View>
+    `)
+  })
+})
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
new file mode 100644
index 0000000000..883a41fbbb
--- /dev/null
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
@@ -0,0 +1,71 @@
+import React from 'react'
+import { defaultTheme } from '../../styles/themes/default.theme'
+import { View, Image, StyleSheet } from 'react-native'
+import { Appbar } from '../Appbar/Appbar.component'
+import { Typography } from '../Typography/Typography.component'
+import ExclamationMark from '../../../assets/icons/exclamationMark.png'
+import { Button } from '../Button/Button.component'
+import { PossibleImpersonationAttackComponentProps } from '../../screens/PossibleImpersonationAttack/PossibleImpersonationAttack.types'
+
+const classes = StyleSheet.create({
+  mainWrapper: {
+    padding: 20,
+    alignItems: 'center',
+    marginTop: 10,
+  },
+  image: {
+    width: 96,
+    height: 83,
+  },
+  title: {
+    marginTop: 32,
+    marginBottom: 24,
+  },
+  text1: {
+    lineHeight: 20,
+    textAlign: 'center',
+  },
+  text2: {
+    lineHeight: 20,
+    textAlign: 'center',
+    marginBottom: 16,
+  },
+})
+
+const PossibleImpersonationAttackComponent: React.FC<PossibleImpersonationAttackComponentProps> = ({
+  handleBackButton,
+  communityName,
+  leaveCommunity,
+}) => {
+  return (
+    <View
+      style={{ flex: 1, backgroundColor: defaultTheme.palette.background.white }}
+      data-testid={'possible-impersonation-attack-component'}
+    >
+      <Appbar title={'Warning!'} back={handleBackButton} crossBackIcon />
+      <View style={classes.mainWrapper}>
+        <Image source={ExclamationMark} style={classes.image} />
+
+        <Typography fontSize={16} fontWeight={'medium'} style={classes.title}>
+          Possible impersonation attack
+        </Typography>
+
+        <Typography fontSize={14} style={classes.text1}>
+          The owner of{' '}
+          <Typography fontSize={14} fontWeight={'medium'}>
+            {communityName}
+          </Typography>{' '}
+          has registered an invalid username. Either something is very broken, the community owner is trying to
+          impersonate other users, or the community owner has been hacked.
+        </Typography>
+
+        <Typography fontSize={14} fontWeight={'bold'} style={classes.text2}>
+          This should never happen and we recommend leaving this community immediately!
+        </Typography>
+        <Button width={160} title={'Leave community'} onPress={leaveCommunity} />
+      </View>
+    </View>
+  )
+}
+
+export default PossibleImpersonationAttackComponent
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.stories.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.stories.tsx
new file mode 100644
index 0000000000..c989eaf969
--- /dev/null
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.stories.tsx
@@ -0,0 +1,7 @@
+import { storiesOf } from '@storybook/react-native'
+import React from 'react'
+import PossibleImpersonationAttackComponent from './PossibleImpersonationAttack.component'
+
+storiesOf('PossibleImpersonationAttack', module).add('Default', () => (
+  <PossibleImpersonationAttackComponent communityName='devteam' leaveCommunity={() => {}} handleBackButton={() => {}} />
+))
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
new file mode 100644
index 0000000000..002fca33a6
--- /dev/null
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
@@ -0,0 +1,323 @@
+import React from 'react'
+import { renderComponent } from '../../utils/functions/renderComponent/renderComponent'
+import PossibleImpersonationAttackComponent from './PossibleImpersonationAttack.component'
+
+describe('PossibleImpersonationAttack component', () => {
+  it('renders properly', () => {
+    const { toJSON } = renderComponent(
+      <PossibleImpersonationAttackComponent
+        communityName={'dev'}
+        handleBackButton={() => {}}
+        leaveCommunity={() => {}}
+      />
+    )
+
+    expect(toJSON()).toMatchInlineSnapshot(`
+      <View
+        data-testid="possible-impersonation-attack-component"
+        style={
+          {
+            "backgroundColor": "#ffffff",
+            "flex": 1,
+          }
+        }
+      >
+        <View
+          style={
+            [
+              {
+                "alignItems": "center",
+                "backgroundColor": "#ffffff",
+                "borderBottomColor": "#F0F0F0",
+                "borderBottomWidth": 1,
+                "display": "flex",
+                "flexDirection": "row",
+                "justifyContent": "center",
+                "maxHeight": 52,
+                "minHeight": 52,
+              },
+            ]
+          }
+        >
+          <View
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          >
+            <View
+              accessibilityState={
+                {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
+                }
+              }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "opacity": 1,
+                }
+              }
+              testID="appbar_action_item"
+            >
+              <View
+                style={
+                  {
+                    "alignItems": "center",
+                    "height": 50,
+                    "justifyContent": "center",
+                    "width": 64,
+                  }
+                }
+              >
+                <Image
+                  resizeMethod="resize"
+                  resizeMode="cover"
+                  source={
+                    {
+                      "testUri": "../../../assets/icons/icon_close.png",
+                    }
+                  }
+                  style={
+                    {
+                      "height": 16,
+                      "width": 16,
+                    }
+                  }
+                />
+              </View>
+            </View>
+          </View>
+          <View
+            style={
+              {
+                "alignItems": "center",
+                "flex": 4,
+              }
+            }
+          >
+            <Text
+              color="main"
+              fontSize={16}
+              fontWeight="medium"
+              horizontalTextAlign="left"
+              style={
+                [
+                  {
+                    "color": "#000000",
+                    "fontFamily": "Rubik-Medium",
+                    "fontSize": 16,
+                    "textAlign": "left",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              Warning!
+            </Text>
+          </View>
+          <View
+            style={
+              {
+                "flex": 1,
+              }
+            }
+          />
+        </View>
+        <View
+          style={
+            {
+              "alignItems": "center",
+              "marginTop": 10,
+              "padding": 20,
+            }
+          }
+        >
+          <Image
+            source={
+              {
+                "testUri": "../../../assets/icons/exclamationMark.png",
+              }
+            }
+            style={
+              {
+                "height": 83,
+                "width": 96,
+              }
+            }
+          />
+          <Text
+            color="main"
+            fontSize={16}
+            fontWeight="medium"
+            horizontalTextAlign="left"
+            style={
+              [
+                {
+                  "color": "#000000",
+                  "fontFamily": "Rubik-Medium",
+                  "fontSize": 16,
+                  "textAlign": "left",
+                  "textAlignVertical": "center",
+                },
+                {
+                  "marginBottom": 24,
+                  "marginTop": 32,
+                },
+              ]
+            }
+            verticalTextAlign="center"
+          >
+            Possible impersonation attack
+          </Text>
+          <Text
+            color="main"
+            fontSize={14}
+            horizontalTextAlign="left"
+            style={
+              [
+                {
+                  "color": "#000000",
+                  "fontFamily": "Rubik-Regular",
+                  "fontSize": 14,
+                  "textAlign": "left",
+                  "textAlignVertical": "center",
+                },
+                {
+                  "lineHeight": 20,
+                  "textAlign": "center",
+                },
+              ]
+            }
+            verticalTextAlign="center"
+          >
+            The owner of
+             
+            <Text
+              color="main"
+              fontSize={14}
+              fontWeight="medium"
+              horizontalTextAlign="left"
+              style={
+                [
+                  {
+                    "color": "#000000",
+                    "fontFamily": "Rubik-Medium",
+                    "fontSize": 14,
+                    "textAlign": "left",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              dev
+            </Text>
+             
+            has registered an invalid username. Either something is very broken, the community owner is trying to impersonate other users, or the community owner has been hacked.
+          </Text>
+          <Text
+            color="main"
+            fontSize={14}
+            fontWeight="bold"
+            horizontalTextAlign="left"
+            style={
+              [
+                {
+                  "color": "#000000",
+                  "fontFamily": "Rubik-Bold",
+                  "fontSize": 14,
+                  "textAlign": "left",
+                  "textAlignVertical": "center",
+                },
+                {
+                  "lineHeight": 20,
+                  "marginBottom": 16,
+                  "textAlign": "center",
+                },
+              ]
+            }
+            verticalTextAlign="center"
+          >
+            This should never happen and we recommend leaving this community immediately!
+          </Text>
+          <View
+            accessibilityState={
+              {
+                "busy": undefined,
+                "checked": undefined,
+                "disabled": undefined,
+                "expanded": undefined,
+                "selected": undefined,
+              }
+            }
+            accessible={true}
+            focusable={true}
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+            style={
+              {
+                "alignItems": "center",
+                "backgroundColor": "#521C74",
+                "borderRadius": 8,
+                "justifyContent": "center",
+                "marginVertical": 12,
+                "minHeight": 45,
+                "paddingVertical": 12,
+                "width": 160,
+              }
+            }
+            testID="button"
+          >
+            <Text
+              color="white"
+              fontSize={14}
+              horizontalTextAlign="left"
+              style={
+                [
+                  {
+                    "color": "#ffffff",
+                    "fontFamily": "Rubik-Regular",
+                    "fontSize": 14,
+                    "textAlign": "left",
+                    "textAlignVertical": "center",
+                  },
+                ]
+              }
+              verticalTextAlign="center"
+            >
+              Leave community
+            </Text>
+          </View>
+        </View>
+      </View>
+    `)
+  })
+})
diff --git a/packages/mobile/src/components/QRCode/QRCode.test.tsx b/packages/mobile/src/components/QRCode/QRCode.test.tsx
index 0a0332134e..5d59997aba 100644
--- a/packages/mobile/src/components/QRCode/QRCode.test.tsx
+++ b/packages/mobile/src/components/QRCode/QRCode.test.tsx
@@ -224,7 +224,7 @@ describe('QRCode component', () => {
                 {
                   "alignItems": "center",
                   "backgroundColor": "#521C74",
-                  "borderRadius": 5,
+                  "borderRadius": 8,
                   "justifyContent": "center",
                   "marginVertical": 12,
                   "minHeight": 45,
diff --git a/packages/mobile/src/components/Registration/UsernameRegistration.component.tsx b/packages/mobile/src/components/Registration/UsernameRegistration.component.tsx
index fd7b0c571c..7c0301ae07 100644
--- a/packages/mobile/src/components/Registration/UsernameRegistration.component.tsx
+++ b/packages/mobile/src/components/Registration/UsernameRegistration.component.tsx
@@ -3,17 +3,24 @@ import { Image, Keyboard, KeyboardAvoidingView, TextInput, View } from 'react-na
 import { Button } from '../Button/Button.component'
 import { Input } from '../Input/Input.component'
 import { Typography } from '../Typography/Typography.component'
-import { UsernameRegistrationProps } from './UsernameRegistration.types'
+import { UsernameRegistrationProps, UsernameVariant } from './UsernameRegistration.types'
 import { appImages } from '../../assets'
 import { parseName } from '@quiet/common'
 import { defaultTheme } from '../../styles/themes/default.theme'
+import { Appbar } from '../Appbar/Appbar.component'
 
 export const UsernameRegistration: FC<UsernameRegistrationProps> = ({
   registerUsernameAction,
   registerUsernameError,
   usernameRegistered,
   fetching,
+  currentUsername,
+  handleBackButton,
+  registeredUsers,
+  variant = UsernameVariant.NEW,
 }) => {
+  const isNewUser = variant === UsernameVariant.NEW
+
   const [userName, setUserName] = useState<string | undefined>()
   const [parsedNameDiffers, setParsedNameDiffers] = useState<boolean>(false)
   const [inputError, setInputError] = useState<string | undefined>()
@@ -40,6 +47,12 @@ export const UsernameRegistration: FC<UsernameRegistrationProps> = ({
     const parsedName = parseName(name)
     setUserName(parsedName)
     setParsedNameDiffers(name !== parsedName)
+    if (registeredUsers && !isNewUser) {
+      const allUsersSet = new Set(Object.values(registeredUsers).map(user => user.username))
+      if (allUsersSet.has(name)) {
+        setInputError(`Username @${name} is already taken`)
+      }
+    }
   }
 
   const onPress = () => {
@@ -72,24 +85,40 @@ export const UsernameRegistration: FC<UsernameRegistrationProps> = ({
       }}
       testID={'username-registration-component'}
     >
+      {!isNewUser && <Appbar title={'Username taken'} back={handleBackButton} crossBackIcon />}
       <KeyboardAvoidingView
         behavior='height'
         style={{
           flex: 1,
-          justifyContent: 'center',
+          justifyContent: !isNewUser ? 'flex-start' : 'center',
           paddingLeft: 20,
           paddingRight: 20,
         }}
       >
-        <Typography fontSize={24} fontWeight={'medium'} style={{ marginBottom: 30 }}>
-          {'Register a username'}
-        </Typography>
+        {isNewUser ? (
+          <>
+            <Typography fontSize={24} fontWeight={'medium'} style={{ marginBottom: 30 }}>
+              {'Register a username'}
+            </Typography>
+          </>
+        ) : (
+          <>
+            <Typography fontSize={14} style={{ marginBottom: 30, marginTop: 30 }}>
+              We’re sorry, but the username{' '}
+              <Typography fontSize={14} fontWeight={'medium'}>{`@${currentUsername}`}</Typography> was already claimed
+              by someone else. Can you choose another name?
+            </Typography>
+          </>
+        )}
+
         <Input
           onChangeText={onChangeText}
-          label={'Choose your favorite username'}
-          placeholder={'Enter a username'}
+          label={isNewUser ? 'Choose your favorite username' : 'Enter a username'}
+          placeholder={isNewUser ? 'Enter a username' : 'Username'}
           hint={
-            'Your username cannot have any spaces or special characters, must be lowercase letters and numbers only.'
+            isNewUser
+              ? 'Your username cannot have any spaces or special characters, must be lowercase letters and numbers only.'
+              : 'Your username will be public, but you can choose any name you like. No spaces or special characters. Lowercase letters and numbers only. '
           }
           disabled={loading}
           validation={inputError}
@@ -117,8 +146,15 @@ export const UsernameRegistration: FC<UsernameRegistrationProps> = ({
             </View>
           </View>
         )}
+
         <View style={{ marginTop: 20 }}>
-          <Button onPress={onPress} title={'Continue'} loading={loading} />
+          <Button
+            disabled={Boolean(inputError)}
+            onPress={onPress}
+            title={'Continue'}
+            loading={loading}
+            width={isNewUser ? undefined : 100}
+          />
         </View>
       </KeyboardAvoidingView>
     </View>
diff --git a/packages/mobile/src/components/Registration/UsernameRegistration.types.ts b/packages/mobile/src/components/Registration/UsernameRegistration.types.ts
index 8779dba073..6f883072e2 100644
--- a/packages/mobile/src/components/Registration/UsernameRegistration.types.ts
+++ b/packages/mobile/src/components/Registration/UsernameRegistration.types.ts
@@ -1,6 +1,17 @@
+import { UserData } from '@quiet/types'
+
 export interface UsernameRegistrationProps {
   registerUsernameAction: (username: string) => void
   registerUsernameError?: string | undefined
   usernameRegistered: boolean
   fetching?: boolean
+  currentUsername?: string
+  variant?: UsernameVariant
+  registeredUsers?: Record<string, UserData>
+  handleBackButton?: () => void
+}
+
+export enum UsernameVariant {
+  NEW = 'new',
+  TAKEN = 'taken',
 }
diff --git a/packages/mobile/src/components/Splash/Splash.component.tsx b/packages/mobile/src/components/Splash/Splash.component.tsx
new file mode 100644
index 0000000000..7b7b09ae84
--- /dev/null
+++ b/packages/mobile/src/components/Splash/Splash.component.tsx
@@ -0,0 +1,45 @@
+import React, { FC } from 'react'
+import { Image, View } from 'react-native'
+import deviceInfoModule from 'react-native-device-info'
+import { Typography } from '../Typography/Typography.component'
+import { defaultTheme } from '../../styles/themes/default.theme'
+import { appImages } from '../../assets'
+
+export const Splash: FC = () => {
+  return (
+    <View
+      style={{
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: defaultTheme.palette.background.white,
+      }}
+      testID='loading'
+    >
+      <Image
+        source={appImages.quiet_icon}
+        style={{
+          marginTop: 20,
+          marginBottom: 46,
+          resizeMode: 'cover',
+          width: 84,
+          height: 84,
+          borderRadius: 16,
+        }}
+      />
+      <View style={{ gap: 6, alignItems: 'center' }}>
+        <Typography fontSize={14} fontWeight={'medium'}>
+          Starting backend
+        </Typography>
+        <Typography fontSize={12} color={'gray50'}>
+          This can take some time
+        </Typography>
+      </View>
+      <View style={{ margin: 20 }}>
+        <Typography fontSize={12} color={'grayDark'}>
+          {`v ${deviceInfoModule.getVersion()}`}
+        </Typography>
+      </View>
+    </View>
+  )
+}
diff --git a/packages/mobile/src/components/Splash/Splash.stories.tsx b/packages/mobile/src/components/Splash/Splash.stories.tsx
new file mode 100644
index 0000000000..eccea15446
--- /dev/null
+++ b/packages/mobile/src/components/Splash/Splash.stories.tsx
@@ -0,0 +1,6 @@
+import { storiesOf } from '@storybook/react-native'
+import React from 'react'
+
+import { Splash } from './Splash.component'
+
+storiesOf('Splash', module).add('Default', () => <Splash />)
diff --git a/packages/mobile/src/components/UserLabel/Unregistered/UnregisteredUsername.test.tsx b/packages/mobile/src/components/UserLabel/Unregistered/UnregisteredUsername.test.tsx
index 5798adb524..d0faf82b97 100644
--- a/packages/mobile/src/components/UserLabel/Unregistered/UnregisteredUsername.test.tsx
+++ b/packages/mobile/src/components/UserLabel/Unregistered/UnregisteredUsername.test.tsx
@@ -197,7 +197,7 @@ describe('UnregisteredUsername component', () => {
               {
                 "alignItems": "center",
                 "backgroundColor": "#521C74",
-                "borderRadius": 5,
+                "borderRadius": 8,
                 "justifyContent": "center",
                 "marginVertical": 12,
                 "minHeight": 45,
diff --git a/packages/mobile/src/const/ScreenNames.enum.ts b/packages/mobile/src/const/ScreenNames.enum.ts
index 06afa606d9..a247293844 100644
--- a/packages/mobile/src/const/ScreenNames.enum.ts
+++ b/packages/mobile/src/const/ScreenNames.enum.ts
@@ -14,4 +14,7 @@ export enum ScreenNames {
   ConnectionProcessScreen = 'ConnectionProcessScreen',
   DuplicatedUsernameScreen = 'DuplicatedUsernameScreen',
   UnregisteredUsernameScreen = 'UnregisteredUsernameScreen',
+  UsernameTakenScreen = 'UsernameTakenScreen',
+  NewUsernameRequestedScreen = 'NewUsernameRequestedScreen',
+  PossibleImpersonationAttackScreen = 'PossibleImpersonationAttackScreen',
 }
diff --git a/packages/mobile/src/route.params.ts b/packages/mobile/src/route.params.ts
index de7ab4dba2..2813798728 100644
--- a/packages/mobile/src/route.params.ts
+++ b/packages/mobile/src/route.params.ts
@@ -42,6 +42,9 @@ export type RootStackParamList = {
   [ScreenNames.UnregisteredUsernameScreen]: {
     username: string
   }
+  [ScreenNames.UsernameTakenScreen]: undefined
+  [ScreenNames.NewUsernameRequestedScreen]: undefined
+  [ScreenNames.PossibleImpersonationAttackScreen]: undefined
 }
 
 export type SplashRouteProp = RouteProp<RootStackParamList, ScreenNames.SplashScreen>
@@ -59,3 +62,11 @@ export type ErrorRouteProp = RouteProp<RootStackParamList, ScreenNames.ErrorScre
 export type DuplicatedUsernameRouteProps = RouteProp<RootStackParamList, ScreenNames.DuplicatedUsernameScreen>
 
 export type UnregisteredUsernameRouteProps = RouteProp<RootStackParamList, ScreenNames.UnregisteredUsernameScreen>
+
+export type UsernameTakenRouteProps = RouteProp<RootStackParamList, ScreenNames.UsernameTakenScreen>
+
+export type NewUsernameRequestedRouteProps = RouteProp<RootStackParamList, ScreenNames.NewUsernameRequestedScreen>
+export type PossibleImpersonationAttackRouteProps = RouteProp<
+  RootStackParamList,
+  ScreenNames.PossibleImpersonationAttackScreen
+>
diff --git a/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx b/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx
index 07f6d3b7f0..518a032e36 100644
--- a/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx
+++ b/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx
@@ -16,7 +16,7 @@ export const LeaveCommunityScreen: FC = () => {
 
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let communityName = ''
+  let communityName = '...'
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)
   }
diff --git a/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.screen.tsx b/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.screen.tsx
new file mode 100644
index 0000000000..38bffdeb08
--- /dev/null
+++ b/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.screen.tsx
@@ -0,0 +1,21 @@
+import React, { useCallback } from 'react'
+import { useDispatch } from 'react-redux'
+import NewUsernameRequestedComponent from '../../components/NewUsernameRequested/NewUsernameRequested.component'
+import { ScreenNames } from '../../const/ScreenNames.enum'
+import { navigationActions } from '../../store/navigation/navigation.slice'
+import { NewUsernameRequestedScreenProps } from './NewUsernameRequested.types'
+
+const NewUsernameRequestedScreen: React.FC<NewUsernameRequestedScreenProps> = () => {
+  const dispatch = useDispatch()
+
+  const handler = useCallback(() => {
+    dispatch(
+      navigationActions.replaceScreen({
+        screen: ScreenNames.ChannelListScreen,
+      })
+    )
+  }, [dispatch])
+  return <NewUsernameRequestedComponent handler={handler} />
+}
+
+export default NewUsernameRequestedScreen
diff --git a/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.types.ts b/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.types.ts
new file mode 100644
index 0000000000..6b298d3a50
--- /dev/null
+++ b/packages/mobile/src/screens/NewUsernameRequested/NewUsernameRequested.types.ts
@@ -0,0 +1,8 @@
+import { NewUsernameRequestedRouteProps } from '../../route.params'
+
+export interface NewUsernameRequestedScreenProps {
+  route: NewUsernameRequestedRouteProps
+}
+export interface NewUsernameRequestedComponentProps {
+  handler: () => void
+}
diff --git a/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen.tsx b/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen.tsx
new file mode 100644
index 0000000000..fe6b959caa
--- /dev/null
+++ b/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen.tsx
@@ -0,0 +1,40 @@
+import React, { FC, useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { navigationActions } from '../../store/navigation/navigation.slice'
+import { ScreenNames } from '../../const/ScreenNames.enum'
+import { capitalizeFirstLetter } from '@quiet/common'
+import { communities } from '@quiet/state-manager'
+import { nativeServicesActions } from '../../store/nativeServices/nativeServices.slice'
+import { PossibleImpersonationAttackScreenProps } from './PossibleImpersonationAttack.types'
+import PossibleImpersonationAttackComponent from '../../components/PossibleImpersonationAttack/PossibleImpersonationAttack.component'
+
+export const PossibleImpersonationAttackScreen: FC<PossibleImpersonationAttackScreenProps> = ({ route }) => {
+  const dispatch = useDispatch()
+
+  const community = useSelector(communities.selectors.currentCommunity)
+
+  let communityName = '...'
+  if (community?.name) {
+    communityName = capitalizeFirstLetter(community.name)
+  }
+
+  const leaveCommunity = useCallback(() => {
+    dispatch(nativeServicesActions.leaveCommunity())
+  }, [dispatch])
+
+  const handleBackButton = useCallback(() => {
+    dispatch(
+      navigationActions.replaceScreen({
+        screen: ScreenNames.ChannelListScreen,
+      })
+    )
+  }, [dispatch])
+
+  return (
+    <PossibleImpersonationAttackComponent
+      handleBackButton={handleBackButton}
+      leaveCommunity={leaveCommunity}
+      communityName={communityName}
+    />
+  )
+}
diff --git a/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.types.ts b/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.types.ts
new file mode 100644
index 0000000000..4a0638b6c8
--- /dev/null
+++ b/packages/mobile/src/screens/PossibleImpersonationAttack/PossibleImpersonationAttack.types.ts
@@ -0,0 +1,10 @@
+import { PossibleImpersonationAttackRouteProps } from '../../route.params'
+
+export interface PossibleImpersonationAttackScreenProps {
+  route: PossibleImpersonationAttackRouteProps
+}
+export interface PossibleImpersonationAttackComponentProps {
+  handleBackButton: () => void
+  communityName: string
+  leaveCommunity: () => void
+}
diff --git a/packages/mobile/src/screens/Splash/Splash.screen.tsx b/packages/mobile/src/screens/Splash/Splash.screen.tsx
index 4ba652c047..5df07a9160 100644
--- a/packages/mobile/src/screens/Splash/Splash.screen.tsx
+++ b/packages/mobile/src/screens/Splash/Splash.screen.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { initSelectors } from '../../store/init/init.selectors'
 import { initActions } from '../../store/init/init.slice'
 import { SplashScreenProps } from './Splash.types'
-import { Loading } from '../../components/Loading/Loading.component'
+import { Splash } from '../../components/Splash/Splash.component'
 
 export const SplashScreen: FC<SplashScreenProps> = ({ route }) => {
   const dispatch = useDispatch()
@@ -21,5 +21,5 @@ export const SplashScreen: FC<SplashScreenProps> = ({ route }) => {
     }
   }, [ready, route.params?.code])
 
-  return <Loading />
+  return <Splash />
 }
diff --git a/packages/mobile/src/screens/UsernameRegistration/UsernameRegistration.screen.tsx b/packages/mobile/src/screens/UsernameRegistration/UsernameRegistration.screen.tsx
index b1d624d156..80f18d1a5a 100644
--- a/packages/mobile/src/screens/UsernameRegistration/UsernameRegistration.screen.tsx
+++ b/packages/mobile/src/screens/UsernameRegistration/UsernameRegistration.screen.tsx
@@ -34,7 +34,7 @@ export const UsernameRegistrationScreen: FC<UsernameRegistrationScreenProps> = (
     if (error) {
       dispatch(errors.actions.clearError(error))
     }
-    dispatch(identity.actions.registerUsername(nickname))
+    dispatch(identity.actions.registerUsername({ nickname: nickname, isUsernameTaken: false }))
     navigation(ScreenNames.ConnectionProcessScreen)
   }
 
diff --git a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
new file mode 100644
index 0000000000..9e2b3dcaed
--- /dev/null
+++ b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
@@ -0,0 +1,56 @@
+import React, { useCallback } from 'react'
+import { errors, identity, users } from '@quiet/state-manager'
+import { useDispatch, useSelector } from 'react-redux'
+import { UsernameTakenScreenProps } from './UsernameTaken.types'
+import { UsernameRegistration } from '../../components/Registration/UsernameRegistration.component'
+import { UsernameVariant } from '../../components/Registration/UsernameRegistration.types'
+import { ScreenNames } from '../../const/ScreenNames.enum'
+import { navigationActions } from '../../store/navigation/navigation.slice'
+
+const UsernameTakenScreen: React.FC<UsernameTakenScreenProps> = () => {
+  const dispatch = useDispatch()
+  const currentIdentity = useSelector(identity.selectors.currentIdentity)
+  const usernameRegistered = currentIdentity?.userCertificate != null
+  const error = useSelector(errors.selectors.registrarErrors)
+  const registeredUsers = useSelector(users.selectors.certificatesMapping)
+
+  const handleBackButton = useCallback(() => {
+    dispatch(
+      navigationActions.replaceScreen({
+        screen: ScreenNames.ChannelListScreen,
+      })
+    )
+  }, [dispatch])
+
+  const handleAction = (nickname: string) => {
+    // Clear errors
+    if (error) {
+      dispatch(errors.actions.clearError(error))
+    }
+    dispatch(
+      identity.actions.registerUsername({
+        nickname,
+        isUsernameTaken: true,
+      })
+    )
+    dispatch(
+      navigationActions.navigation({
+        screen: ScreenNames.NewUsernameRequestedScreen,
+      })
+    )
+  }
+
+  return (
+    <UsernameRegistration
+      registerUsernameAction={handleAction}
+      usernameRegistered={usernameRegistered}
+      fetching={false}
+      variant={UsernameVariant.TAKEN}
+      handleBackButton={handleBackButton}
+      currentUsername={currentIdentity?.nickname}
+      registeredUsers={registeredUsers}
+    />
+  )
+}
+
+export default UsernameTakenScreen
diff --git a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.types.ts b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.types.ts
new file mode 100644
index 0000000000..f7398c9c20
--- /dev/null
+++ b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.types.ts
@@ -0,0 +1,5 @@
+import { UsernameTakenRouteProps } from '../../route.params'
+
+export interface UsernameTakenScreenProps {
+  route: UsernameTakenRouteProps
+}
diff --git a/packages/mobile/src/store/navigation/redirection/redirection.saga.test.ts b/packages/mobile/src/store/navigation/redirection/redirection.saga.test.ts
index af79521478..973be6336f 100644
--- a/packages/mobile/src/store/navigation/redirection/redirection.saga.test.ts
+++ b/packages/mobile/src/store/navigation/redirection/redirection.saga.test.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from 'redux'
 import { expectSaga } from 'redux-saga-test-plan'
 import { FactoryGirl } from 'factory-girl'
-import { getFactory, identity } from '@quiet/state-manager'
+import { generateMessageFactoryContentWithId, getFactory, identity, publicChannels } from '@quiet/state-manager'
 import { setupCrypto } from '@quiet/identity'
 
 import { navigationActions } from '../navigation.slice'
@@ -59,7 +59,27 @@ describe('redirectionSaga', () => {
   })
 
   test('redirect if user sees a splash screen being a member of community', async () => {
-    await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity')
+    const alice = await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity')
+
+    const _publicChannels = publicChannels.selectors.publicChannels(store.getState())
+    const _generalChannel = _publicChannels.find(c => c.name === 'general')
+
+    const generalChannel = {
+      ..._generalChannel,
+      // @ts-ignore
+      messages: undefined,
+      messagesSlice: undefined,
+    }
+
+    if (!generalChannel.id) return
+
+    const message = (
+      await factory.create<ReturnType<typeof publicChannels.actions.test_message>['payload']>('Message', {
+        identity: alice,
+        message: generateMessageFactoryContentWithId(generalChannel.id),
+        verifyAutomatically: true,
+      })
+    ).message
 
     const reducer = combineReducers(reducers)
     await expectSaga(redirectionSaga)
diff --git a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
index a2f60b5519..f05f04593d 100644
--- a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
+++ b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
@@ -3,7 +3,7 @@ import { initSelectors } from '../../init/init.selectors'
 import { navigationSelectors } from '../navigation.selectors'
 import { navigationActions } from '../navigation.slice'
 import { ScreenNames } from '../../../const/ScreenNames.enum'
-import { identity } from '@quiet/state-manager'
+import { identity, publicChannels, users } from '@quiet/state-manager'
 import { initActions } from '../../init/init.slice'
 
 export function* redirectionSaga(): Generator {
@@ -25,10 +25,34 @@ export function* redirectionSaga(): Generator {
     return
   }
 
+  const isUsernameTaken = yield* select(identity.selectors.usernameTaken)
+
+  if (isUsernameTaken) {
+    yield* put(
+      navigationActions.replaceScreen({
+        screen: ScreenNames.UsernameTakenScreen,
+      })
+    )
+  }
+
+  const duplicateCerts = yield* select(users.selectors.duplicateCerts)
+
+  if (duplicateCerts) {
+    yield* put(
+      navigationActions.replaceScreen({
+        screen: ScreenNames.PossibleImpersonationAttackScreen,
+      })
+    )
+    return
+  }
+
   // If user belongs to a community, let him directly into the app
+  // Check while QA session!
+  const currentChannelDisplayableMessages = yield* select(publicChannels.selectors.currentChannelMessagesMergedBySender)
+  const areMessagesLoaded = Object.values(currentChannelDisplayableMessages).length > 0
   const communityMembership = yield* select(identity.selectors.communityMembership)
 
-  if (communityMembership) {
+  if (communityMembership && areMessagesLoaded) {
     yield* put(
       navigationActions.replaceScreen({
         screen: ScreenNames.ChannelListScreen,
diff --git a/packages/mobile/src/styles/palettes/default.palette.ts b/packages/mobile/src/styles/palettes/default.palette.ts
index 0c0a696dfe..226fdade57 100644
--- a/packages/mobile/src/styles/palettes/default.palette.ts
+++ b/packages/mobile/src/styles/palettes/default.palette.ts
@@ -28,7 +28,7 @@ export const defaultPalette = {
     lightGray: '#B2B2B2',
   },
   input: {
-    border: '#B3B3B3',
+    border: '#C4C4C4',
     backgroundDefault: '#ffffff',
     backgroundDisabled: '#EBEBEB',
   },
diff --git a/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
new file mode 100644
index 0000000000..d427c06030
--- /dev/null
+++ b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
@@ -0,0 +1,82 @@
+import React from 'react'
+import '@testing-library/jest-native/extend-expect'
+import { act } from '@testing-library/react-native'
+import MockedSocket from 'socket.io-mock'
+import { ioMock } from '../setupTests'
+import { prepareStore } from './utils/prepareStore'
+import { renderComponent } from './utils/renderComponent'
+import { FactoryGirl } from 'factory-girl'
+import { getFactory, communities, identity, users } from '@quiet/state-manager'
+import { navigationActions } from '../store/navigation/navigation.slice'
+import { PossibleImpersonationAttackScreen } from '../screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen'
+import { ScreenNames } from '../const/ScreenNames.enum'
+import { navigationSelectors } from '../store/navigation/navigation.selectors'
+import { initActions } from '../store/init/init.slice'
+
+describe('Possible Impersonation Attack', () => {
+  let socket: MockedSocket
+
+  let factory: FactoryGirl
+
+  beforeEach(async () => {
+    socket = new MockedSocket()
+    ioMock.mockImplementation(() => socket)
+  })
+
+  it('Open modal when certifcates are duplicated', async () => {
+    const { store, root } = await prepareStore({}, socket)
+    store.dispatch(initActions.setStoreReady())
+    factory = await getFactory(store)
+
+    const community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>(
+      'Community'
+    )
+
+    await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity', {
+      id: community.id,
+      nickname: 'alice',
+    })
+
+    const route: { key: string; name: ScreenNames.PossibleImpersonationAttackScreen; path?: string | undefined } = {
+      key: '',
+      name: ScreenNames.PossibleImpersonationAttackScreen,
+    }
+    renderComponent(
+      <>
+        <PossibleImpersonationAttackScreen route={route} />
+      </>,
+      store
+    )
+
+    const cert1 =
+      'MIIDeDCCAx6gAwIBAgIGAYr6Jw3hMAoGCCqGSM49BAMCMA8xDTALBgNVBAMTBGZyZmQwHhcNMjMxMDA0MTAwNjE4WhcNMzAwMTMxMjMwMDAwWjBJMUcwRQYDVQQDEz5tenhydWhyNWJzdGt3dmp3eWJnZ2Y2M2Jma2dreWw0aWs0bG5lanN1YnFlaG9td3Vpbm43d3JxZC5vbmlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGcKhXLUNjkS9+xd0hYfJBOA7bXB5LwZojhzgBQps3SW/CSR6ABiAuirdP0x/byxTXSkZY23lBkvc5CqMjWe3lWjggIqMIICJjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIAgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwggFHBgkqhkiG9w0BCQwEggE4BIIBNAXhwXxmLy7Gg5uonlWXiqRUimGLj2cPbAoK9DnKHkcohqdLvEzyz6rM7KBewO068fag0d/PR0uh37Oyb7d/JAbBjhJmf8wOl2HfLTThPEEH8isy3bxHXx4Ir5prVVk1zx8UiXtPAu6gK41FY5Oin6SpV07MBewqQGcbCovcbBSwkp6EXmLXPOGgmpFlQf5CNGIs3YqPD+Ll1vn8Lq5QIGCa210Pq/T65mrPsXVAw2vJO6DFRIAGrAF5VxDS8G2dSwnDnje+bD2NO8qlfwFdO3bkDeheOqZXCSxlPA6q1bY34qYR2zrwSiQCjRiCQjifRCmF2Jg4ojzLGUL0pKdvi+8fDQXollmazh5boJWN9GRy+1sDLTk01cW2kF7esew5PlDi8kX0v2hY+XsR5eQga1j3MkXkMBgGCisGAQQBg4wbAgEEChMIdXNlcm5hbWUwPQYJKwYBAgEPAwEBBDATLlFtUHF6THFheFk1UmI4VlpjM1VuZmlXZXRxVDZKWkp6SnRjWVFXNmhXTENvRXIwSQYDVR0RBEIwQII+bXp4cnVocjVic3Rrd3Zqd3liZ2dmNjNiZmtna3lsNGlrNGxuZWpzdWJxZWhvbXd1aW5uN3dycWQub25pb24wCgYIKoZIzj0EAwIDSAAwRQIhAJx4YX8KtOA4WGAWzW0M7FvuoblNOb370521GsfuHfbMAiBEYQ4l074oUEF2DTVK1agJlhMR5USRxav5xEpx2ujMeA=='
+
+    const cert2 =
+      'MIIDdzCCAx2gAwIBAgIGAYr6JZFvMAoGCCqGSM49BAMCMA4xDDAKBgNVBAMTA2RldjAeFw0yMzEwMDQxMDA0NDBaFw0zMDAxMzEyMzAwMDBaMEkxRzBFBgNVBAMTPnRvaWwydGhwamNwejVxNjNzNnZidXB4eHRkbjJ3NGxpY2x5NXlzcmN5cnNyanZieGhuZW5qZHlkLm9uaW9uMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5mAo+7fqZimgOwtzVHR/sWl/8n4bXWMtk2PrQ3Eri1a05Y3upQR07UG72O3aH30QSn8upmPqUjsPtbyhtEMXi6OCAiowggImMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgCAMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATCCAUcGCSqGSIb3DQEJDASCATgEggE0B/mkyxZeflBGdsVcbR1hHYOhCv8Jlb6FDAmV1HFtHzEn3WNi96hBpW/GWMnfNR5Wv0Uofzf+A51svouXtFUGEt8aELjqgHMnrwkRR5BHN3XhvVjcYpX9uLf9HcbBdMpgdcrFKLTblTlMcNGczZVAjTt5O6x6MjxlzSHlDnBt8owNPap9xwn0SFgNHfxfg4XXUml1U96G+Ayzgjmu5Hy+A+JZcqSWdK3xyBzf9g9JhSV5tit7W+xzHvD+FFc2434dbYKbJxthxXGQp3mfZz8ILaxtGEeXOewNTXTjvybv9da2ZXofj3ODAdeNZzhy4NQ2ptUU4hW8QFrpr44vJRXeT7JgTpIJaZecPD51UQ3mfqOffYzthM6zhiU5t7tiVo86a4nlVgNJLzGcVJ3aObAnT6M2dnQwGAYKKwYBBAGDjBsCAQQKEwh1c2VybmFtZTA9BgkrBgECAQ8DAQEEMBMuUW1RS0Rqd2tVTjZYRUZQaVA5V0tBaUZjUXNZQlhIWEtzcHhHNlZ1WU1ZVkFHRzBJBgNVHREEQjBAgj50b2lsMnRocGpjcHo1cTYzczZ2YnVweHh0ZG4ydzRsaWNseTV5c3JjeXJzcmp2YnhobmVuamR5ZC5vbmlvbjAKBggqhkjOPQQDAgNIADBFAiBFaaJYuacbj60wEU9uur7lMoWwhf+uavBnKdoKg93LIQIhAMrd3PN6rggZ4gRNNzhno5yrwTm3/B0ZHaG+zGuO7J8c'
+
+    store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: cert1,
+      })
+    )
+
+    store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: cert2,
+      })
+    )
+
+    await act(async () => {})
+
+    store.dispatch(navigationActions.redirection())
+
+    await act(async () => {})
+
+    const duplicateCerts = users.selectors.duplicateCerts(store.getState())
+    const currentScreen = navigationSelectors.currentScreen(store.getState())
+
+    expect(currentScreen).toBe(ScreenNames.PossibleImpersonationAttackScreen)
+    expect(duplicateCerts).toBeTruthy()
+    root?.cancel()
+  })
+})
diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md
index 0f418854e7..63a2b3bd65 100644
--- a/packages/state-manager/CHANGELOG.md
+++ b/packages/state-manager/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.1...@quiet/state-manager@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/state-manager@2.0.1-alpha.0...@quiet/state-manager@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/state-manager@2.0.0-alpha.4...@quiet/state-manager@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/state-manager@2.0.0-alpha.4...@quiet/state-manager@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/state-manager
diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json
index d7f4ea07b8..d7790a18b5 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index ee2a448251..58ad6c3195 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "",
   "main": "lib/index.js",
   "private": true,
@@ -23,9 +23,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@quiet/common": "^2.0.0-alpha.18",
-    "@quiet/logger": "^2.0.0-alpha.18",
-    "@quiet/types": "^2.0.0-alpha.18",
+    "@quiet/common": "^2.0.1-alpha.2",
+    "@quiet/logger": "^2.0.1-alpha.2",
+    "@quiet/types": "^2.0.1-alpha.2",
     "@reduxjs/toolkit": "^1.9.1",
     "factory-girl": "^5.0.4",
     "get-port": "^5.1.1",
@@ -44,8 +44,8 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
-    "@quiet/identity": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
+    "@quiet/identity": "^2.0.1-alpha.2",
     "@types/factory-girl": "^5.0.8",
     "@types/jest": "^26.0.24",
     "@types/luxon": "^2.0.0",
diff --git a/packages/state-manager/src/index.ts b/packages/state-manager/src/index.ts
index fc41960a33..697ae67bc1 100644
--- a/packages/state-manager/src/index.ts
+++ b/packages/state-manager/src/index.ts
@@ -82,8 +82,6 @@ export * from './constants'
 
 export { formatBytes } from './utils/functions/formatBytes/formatBytes'
 
-export { sortPeers } from './utils/functions/sortPeers/sortPeers'
-
 export { getInvitationCodes } from './utils/functions/invitationCode/invitationCode'
 
 export type { Socket } from './types'
diff --git a/packages/state-manager/src/sagas/appConnection/connection.selectors.ts b/packages/state-manager/src/sagas/appConnection/connection.selectors.ts
index 876d69b5dc..b0f7606fcf 100644
--- a/packages/state-manager/src/sagas/appConnection/connection.selectors.ts
+++ b/packages/state-manager/src/sagas/appConnection/connection.selectors.ts
@@ -5,9 +5,9 @@ import { allUsers } from '../users/users.selectors'
 import { communitiesSelectors } from '../communities/communities.selectors'
 import { peersStatsAdapter } from './connection.adapter'
 import { connectedPeers } from '../network/network.selectors'
-import { sortPeers } from '../../utils/functions/sortPeers/sortPeers'
 import { type NetworkStats } from './connection.types'
 import { type User } from '../users/users.types'
+import { sortPeers } from '@quiet/common'
 
 const connectionSlice: CreatedSelectors[StoreKeys.Connection] = (state: StoreState) => state[StoreKeys.Connection]
 
diff --git a/packages/state-manager/src/sagas/communities/launchCommunity/launchCommunity.saga.test.ts b/packages/state-manager/src/sagas/communities/launchCommunity/launchCommunity.saga.test.ts
index 253624c057..36277c72ef 100644
--- a/packages/state-manager/src/sagas/communities/launchCommunity/launchCommunity.saga.test.ts
+++ b/packages/state-manager/src/sagas/communities/launchCommunity/launchCommunity.saga.test.ts
@@ -286,7 +286,7 @@ describe('launchCommunity', () => {
           },
         }
       )
-      .put(identityActions.registerUsername(identityAlpha.nickname))
+      .put(identityActions.registerUsername({ nickname: identityAlpha.nickname }))
       .put(communitiesActions.launchCommunity(community2.id))
       .run()
   })
diff --git a/packages/state-manager/src/sagas/identity/identity.selectors.ts b/packages/state-manager/src/sagas/identity/identity.selectors.ts
index 42e154d575..9004adb288 100644
--- a/packages/state-manager/src/sagas/identity/identity.selectors.ts
+++ b/packages/state-manager/src/sagas/identity/identity.selectors.ts
@@ -3,6 +3,7 @@ import { createSelector } from '@reduxjs/toolkit'
 import { identityAdapter } from './identity.adapter'
 import { type CreatedSelectors, type StoreState } from '../store.types'
 import { communitiesSelectors, selectCommunities } from '../communities/communities.selectors'
+import { certificatesMapping } from '../users/users.selectors'
 
 const identitySlice: CreatedSelectors[StoreKeys.Identity] = (state: StoreState) => state[StoreKeys.Identity]
 
@@ -22,6 +23,10 @@ export const currentIdentity = createSelector(
 )
 
 export const communityMembership = createSelector(currentIdentity, identity => {
+  return Boolean(identity?.userCsr)
+})
+
+export const hasCertificate = createSelector(currentIdentity, identity => {
   return Boolean(identity?.userCertificate)
 })
 
@@ -37,6 +42,21 @@ export const csr = createSelector(communitiesSelectors.currentCommunityId, selec
   return identities[id]?.userCsr
 })
 
+export const usernameTaken = createSelector(currentIdentity, certificatesMapping, (identity, certs) => {
+  const userCertificate = identity?.userCertificate
+  if (userCertificate) return false
+
+  const username = identity?.nickname
+  if (!username) return false
+
+  const allUsersSet = new Set(Object.values(certs).map(user => user.username))
+  if (allUsersSet.has(username)) {
+    return true
+  }
+
+  return false
+})
+
 export const identitySelectors = {
   selectById,
   selectEntities,
@@ -45,4 +65,6 @@ export const identitySelectors = {
   joinedCommunities,
   joinTimestamp,
   csr,
+  usernameTaken,
+  hasCertificate,
 }
diff --git a/packages/state-manager/src/sagas/identity/identity.slice.ts b/packages/state-manager/src/sagas/identity/identity.slice.ts
index 445ac34449..bcf978ebdc 100644
--- a/packages/state-manager/src/sagas/identity/identity.slice.ts
+++ b/packages/state-manager/src/sagas/identity/identity.slice.ts
@@ -8,6 +8,7 @@ import {
   type Identity,
   type RegisterCertificatePayload,
   type StoreUserCertificatePayload,
+  type RegisterUsernamePayload,
 } from '@quiet/types'
 export class IdentityState {
   public identities: EntityState<Identity> = identityAdapter.getInitialState()
@@ -23,7 +24,7 @@ export const identitySlice = createSlice({
     createUserCsr: (state, _action: PayloadAction<CreateUserCsrPayload>) => state,
     saveOwnerCertToDb: state => state,
     savedOwnerCertificate: (state, _action: PayloadAction<string>) => state,
-    registerUsername: (state, _action: PayloadAction<string>) => state,
+    registerUsername: (state, _action: PayloadAction<RegisterUsernamePayload>) => state,
     registerCertificate: (state, action: PayloadAction<RegisterCertificatePayload>) => {
       identityAdapter.updateOne(state.identities, {
         id: action.payload.communityId,
diff --git a/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.test.ts b/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.test.ts
index 81e94d2372..dacb04a8c2 100644
--- a/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.test.ts
+++ b/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.test.ts
@@ -105,4 +105,61 @@ describe('registerCertificateSaga', () => {
       .put(communitiesActions.launchCommunity(community.id))
       .run()
   })
+
+  it('launch community when user is not community owner and he used username which was taken', async () => {
+    setupCrypto()
+    const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
+
+    const store = prepareStore().store
+
+    const factory = await getFactory(store)
+
+    const community = await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>(
+      'Community',
+      {
+        id: '1',
+        name: 'rockets',
+        registrarUrl: 'http://registrarUrl.onion',
+        CA: null,
+        rootCa: 'rootCa',
+        peerList: [],
+        registrar: null,
+        onionAddress: '',
+        privateKey: '',
+        port: 0,
+      }
+    )
+
+    const userCsr: UserCsr = {
+      userCsr: 'userCsr',
+      userKey: 'userKey',
+      pkcs10: jest.fn() as unknown as CertData,
+    }
+
+    const identity = (
+      await factory.build<typeof identityActions.addNewIdentity>('Identity', {
+        id: community.id,
+      })
+    ).payload
+
+    identity.userCsr = userCsr
+
+    store.dispatch(identityActions.addNewIdentity(identity))
+
+    const registerCertificatePayload: RegisterCertificatePayload = {
+      communityId: community.id,
+      nickname: identity.nickname,
+      userCsr: identity.userCsr,
+      isUsernameTaken: true,
+    }
+
+    const reducer = combineReducers(reducers)
+    await expectSaga(registerCertificateSaga, socket, identityActions.registerCertificate(registerCertificatePayload))
+      .withReducer(reducer)
+      .withState(store.getState())
+      .not.apply(socket, socket.emit, [SocketActionTypes.REGISTER_OWNER_CERTIFICATE])
+      .not.put(communitiesActions.launchCommunity(community.id))
+      .put(identityActions.saveUserCsr())
+      .run()
+  })
 })
diff --git a/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.ts b/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.ts
index ade168914d..aef5910547 100644
--- a/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.ts
+++ b/packages/state-manager/src/sagas/identity/registerCertificate/registerCertificate.saga.ts
@@ -2,7 +2,7 @@ import { applyEmitParams, type Socket } from '../../../types'
 import { type PayloadAction } from '@reduxjs/toolkit'
 import { apply, select, put } from 'typed-redux-saga'
 import { communitiesSelectors } from '../../communities/communities.selectors'
-import { type identityActions } from '../identity.slice'
+import { identityActions } from '../identity.slice'
 import {
   type RegisterOwnerCertificatePayload,
   type RegisterUserCertificatePayload,
@@ -15,6 +15,7 @@ export function* registerCertificateSaga(
   action: PayloadAction<ReturnType<typeof identityActions.registerCertificate>['payload']>
 ): Generator {
   const currentCommunity = yield* select(communitiesSelectors.currentCommunity)
+  const isUsernameTaken = action.payload.isUsernameTaken
   if (!currentCommunity) {
     console.error('Could not register certificate, no current community')
     return
@@ -32,6 +33,10 @@ export function* registerCertificateSaga(
 
     yield* apply(socket, socket.emit, applyEmitParams(SocketActionTypes.REGISTER_OWNER_CERTIFICATE, payload))
   } else {
-    yield* put(communitiesActions.launchCommunity(action.payload.communityId))
+    if (!isUsernameTaken) {
+      yield* put(communitiesActions.launchCommunity(action.payload.communityId))
+    } else {
+      yield* put(identityActions.saveUserCsr())
+    }
   }
 }
diff --git a/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.test.ts b/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.test.ts
index dd0651869d..f536ec15be 100644
--- a/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.test.ts
+++ b/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.test.ts
@@ -1,7 +1,7 @@
 import { combineReducers } from '@reduxjs/toolkit'
 import { expectSaga } from 'redux-saga-test-plan'
 import { call } from 'redux-saga-test-plan/matchers'
-import { setupCrypto, createUserCsr, type UserCsr } from '@quiet/identity'
+import { setupCrypto, createUserCsr, type UserCsr, getPubKey, loadPrivateKey, pubKeyFromCsr } from '@quiet/identity'
 import { prepareStore } from '../../../utils/tests/prepareStore'
 import { getFactory } from '../../../utils/tests/factories'
 import { reducers } from '../../reducers'
@@ -42,6 +42,7 @@ describe('registerUsernameSaga', () => {
     const identity = await factory.create<ReturnType<typeof identityActions.addNewIdentity>['payload']>('Identity', {
       nickname: undefined,
       id: community.id,
+      userCsr: null,
     })
 
     const userCsr: UserCsr = {
@@ -59,7 +60,7 @@ describe('registerUsernameSaga', () => {
       hashAlg: config.hashAlg,
     }
     const reducer = combineReducers(reducers)
-    await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername('nickname'))
+    await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername({ nickname: 'nickname' }))
       .withReducer(reducer)
       .withState(store.getState())
       .provide([[call.fn(createUserCsr), userCsr]])
@@ -80,12 +81,95 @@ describe('registerUsernameSaga', () => {
           communityId: community.id,
           nickname: 'nickname',
           userCsr,
+          isUsernameTaken: false,
         })
       )
       .run()
   })
 
-  it("reuse existing csr if provided username hasn't changed", async () => {
+  it('username taken - use current CSR and new nickname', async () => {
+    setupCrypto()
+    const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
+
+    const store = prepareStore().store
+
+    const factory = await getFactory(store)
+
+    const community = await factory.create<ReturnType<typeof communitiesActions.addNewCommunity>['payload']>(
+      'Community',
+      {
+        id: '1',
+        name: 'rockets',
+        registrarUrl: 'registrarUrl',
+        CA: null,
+        rootCa: 'rootCa',
+        peerList: [],
+        registrar: null,
+        onionAddress: '',
+        privateKey: '',
+        port: 0,
+      }
+    )
+    const oldNickname = 'john'
+    const newNickname = 'paul'
+    const userCsr: UserCsr = {
+      userCsr: 'userCsr',
+      userKey: 'userKey',
+      pkcs10: jest.fn() as unknown as CertData,
+    }
+
+    const identity = await factory.create<ReturnType<typeof identityActions.addNewIdentity>['payload']>('Identity', {
+      nickname: oldNickname,
+      id: community.id,
+      userCsr: userCsr,
+    })
+    if (!identity.userCsr?.userCsr) return
+    const pubKey = 'pubKey'
+    const privateKey = 'privateKey'
+    const publicKey = 'publicKey'
+
+    const createUserCsrPayload: CreateUserCsrPayload = {
+      nickname: newNickname,
+      commonName: identity.hiddenService.onionAddress,
+      peerId: identity.peerId.id,
+      dmPublicKey: identity.dmKeys.publicKey,
+      signAlg: config.signAlg,
+      hashAlg: config.hashAlg,
+      existingKeyPair: {
+        privateKey: privateKey as unknown as CryptoKey,
+        publicKey: publicKey as unknown as CryptoKey,
+      },
+    }
+    const reducer = combineReducers(reducers)
+    await expectSaga(
+      registerUsernameSaga,
+      socket,
+      identityActions.registerUsername({ nickname: newNickname, isUsernameTaken: true })
+    )
+      .withReducer(reducer)
+      .withState(store.getState())
+      .provide([
+        [call.fn(pubKeyFromCsr), pubKey],
+        [call.fn(loadPrivateKey), privateKey],
+        [call.fn(getPubKey), publicKey],
+        [call.fn(createUserCsr), userCsr],
+      ])
+      .call(pubKeyFromCsr, identity.userCsr.userCsr)
+      .call(loadPrivateKey, identity.userCsr.userKey, config.signAlg)
+      .call(getPubKey, pubKey)
+      .call(createUserCsr, createUserCsrPayload)
+      .put(
+        identityActions.registerCertificate({
+          communityId: community.id,
+          nickname: newNickname,
+          userCsr,
+          isUsernameTaken: true,
+        })
+      )
+      .run()
+  })
+  //outdated
+  it.skip("reuse existing csr if provided username hasn't changed", async () => {
     setupCrypto()
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
@@ -126,7 +210,7 @@ describe('registerUsernameSaga', () => {
 
     store.dispatch(identityActions.addNewIdentity(identity))
     const reducer = combineReducers(reducers)
-    await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername(identity.nickname))
+    await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername({ nickname: identity.nickname }))
       .withReducer(reducer)
       .withState(store.getState())
       .not.call(createUserCsr)
@@ -150,8 +234,8 @@ describe('registerUsernameSaga', () => {
       )
       .run()
   })
-
-  it("don't reuse existing csr if provided username has changed", async () => {
+  //outdated
+  it.skip("don't reuse existing csr if provided username has changed", async () => {
     setupCrypto()
     const socket = { emit: jest.fn(), on: jest.fn() } as unknown as Socket
 
@@ -207,7 +291,13 @@ describe('registerUsernameSaga', () => {
       hashAlg: config.hashAlg,
     }
     const reducer = combineReducers(reducers)
-    await expectSaga(registerUsernameSaga, socket, identityActions.registerUsername('nickname'))
+    await expectSaga(
+      registerUsernameSaga,
+      socket,
+      identityActions.registerUsername({
+        nickname: 'nickname',
+      })
+    )
       .withReducer(reducer)
       .withState(store.getState())
       .provide([[call.fn(createUserCsr), userCsr]])
diff --git a/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.ts b/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.ts
index 52642d02d2..c92d859fe1 100644
--- a/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.ts
+++ b/packages/state-manager/src/sagas/identity/registerUsername/registerUsername.saga.ts
@@ -1,6 +1,6 @@
 import { PayloadAction } from '@reduxjs/toolkit'
 import { select, put, call, take, apply, delay } from 'typed-redux-saga'
-import { createUserCsr } from '@quiet/identity'
+import { createUserCsr, getPubKey, keyObjectFromString, loadPrivateKey, pubKeyFromCsr } from '@quiet/identity'
 import { identitySelectors } from '../identity.selectors'
 import { identityActions } from '../identity.slice'
 import { config } from '../../users/const/certFieldTypes'
@@ -8,10 +8,13 @@ import { Socket, applyEmitParams } from '../../../types'
 import { communitiesSelectors } from '../../communities/communities.selectors'
 import { CreateUserCsrPayload, RegisterCertificatePayload, SocketActionTypes, Community } from '@quiet/types'
 
-export function* registerUsernameSaga(socket: Socket, action: PayloadAction<string>): Generator {
+export function* registerUsernameSaga(
+  socket: Socket,
+  action: PayloadAction<ReturnType<typeof identityActions.registerUsername>['payload']>
+): Generator {
   // Nickname can differ between saga calls
 
-  const nickname = action.payload
+  const { nickname, isUsernameTaken = false } = action.payload
 
   const community = yield* select(communitiesSelectors.currentCommunity)
 
@@ -28,7 +31,9 @@ export function* registerUsernameSaga(socket: Socket, action: PayloadAction<stri
     rootCa: community.CA?.rootCertString,
   }
 
-  yield* apply(socket, socket.emit, applyEmitParams(SocketActionTypes.CREATE_NETWORK, networkPayload))
+  if (!isUsernameTaken) {
+    yield* apply(socket, socket.emit, applyEmitParams(SocketActionTypes.CREATE_NETWORK, networkPayload))
+  }
 
   let identity = yield* select(identitySelectors.currentIdentity)
 
@@ -37,19 +42,42 @@ export function* registerUsernameSaga(socket: Socket, action: PayloadAction<stri
   }
 
   identity = yield* select(identitySelectors.currentIdentity)
+
   if (!identity) {
     console.error('Could not register username, no identity')
     return
   }
 
-  let userCsr = null
+  let userCsr = identity.userCsr
 
-  // Reuse the same csr if nickname hasn't changed
-  if (identity.nickname === nickname) {
-    userCsr = identity.userCsr
-  }
+  if (userCsr) {
+    try {
+      if (identity.userCsr?.userCsr == null || identity.userCsr.userKey == null) {
+        console.error('identity.userCsr?.userCsr == null || identity.userCsr.userKey == null')
+        return
+      }
+      const _pubKey = yield* call(pubKeyFromCsr, identity.userCsr.userCsr)
+      const privateKey = yield* call(loadPrivateKey, identity.userCsr.userKey, config.signAlg)
+      const publicKey = yield* call(getPubKey, _pubKey)
+
+      const existingKeyPair: CryptoKeyPair = { privateKey, publicKey }
+
+      const payload: CreateUserCsrPayload = {
+        nickname,
+        commonName: identity.hiddenService.onionAddress,
+        peerId: identity.peerId.id,
+        dmPublicKey: identity.dmKeys.publicKey,
+        signAlg: config.signAlg,
+        hashAlg: config.hashAlg,
+        existingKeyPair,
+      }
 
-  if (userCsr === null) {
+      userCsr = yield* call(createUserCsr, payload)
+    } catch (e) {
+      console.error(e)
+      return
+    }
+  } else {
     try {
       const payload: CreateUserCsrPayload = {
         nickname,
@@ -70,6 +98,7 @@ export function* registerUsernameSaga(socket: Socket, action: PayloadAction<stri
     communityId: community.id,
     nickname,
     userCsr,
+    isUsernameTaken,
   }
 
   yield* put(identityActions.registerCertificate(payload))
diff --git a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
index ca304e8e6a..a03438bd5d 100644
--- a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
+++ b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
@@ -2,12 +2,12 @@ import { SendCertificatesResponse } from '@quiet/types'
 import { PayloadAction } from '@reduxjs/toolkit'
 import { select, call, put } from 'typed-redux-saga'
 import { identitySelectors } from '../identity.selectors'
-import { CertFieldsTypes, getCertFieldValue, getReqFieldValue, loadCSR, parseCertificate } from '@quiet/identity'
+import { loadCSR, pubKeyMatch } from '@quiet/identity'
 import { identityActions } from '../identity.slice'
 import { communitiesSelectors } from '../../communities/communities.selectors'
 
 export function* updateCertificateSaga(action: PayloadAction<SendCertificatesResponse>): Generator {
-  const certificate = yield* select(identitySelectors.communityMembership)
+  const certificate = yield* select(identitySelectors.hasCertificate)
   const communityId = yield* select(communitiesSelectors.currentCommunityId)
 
   if (certificate) return
@@ -17,12 +17,9 @@ export function* updateCertificateSaga(action: PayloadAction<SendCertificatesRes
   if (!csr?.userCsr) return
 
   const parsedCsr = yield* call(loadCSR, csr?.userCsr)
-  const pubKey = getReqFieldValue(parsedCsr, CertFieldsTypes.dmPublicKey)
 
   const cert = action.payload.certificates.find(cert => {
-    const parsedCert = parseCertificate(cert)
-    const certPubKey = getCertFieldValue(parsedCert, CertFieldsTypes.dmPublicKey)
-    if (certPubKey === pubKey) return cert
+    if (pubKeyMatch(cert, parsedCsr)) return cert
   })
 
   if (cert) {
diff --git a/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts b/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts
index e83a4ee11d..1bcef1e1da 100644
--- a/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts
+++ b/packages/state-manager/src/sagas/socket/startConnection/startConnection.saga.ts
@@ -246,12 +246,6 @@ export function subscribe(socket: Socket) {
           ownerCertificate: payload.network.certificate,
         })
       )
-      emit(
-        communitiesActions.storePeerList({
-          communityId: payload.communityId,
-          peerList: payload.network.peers,
-        })
-      )
       emit(
         identityActions.storeUserCertificate({
           userCertificate: payload.network.certificate,
diff --git a/packages/state-manager/src/sagas/users/users.selectors.ts b/packages/state-manager/src/sagas/users/users.selectors.ts
index 1371c6eaf0..2a4c9a528c 100644
--- a/packages/state-manager/src/sagas/users/users.selectors.ts
+++ b/packages/state-manager/src/sagas/users/users.selectors.ts
@@ -77,10 +77,17 @@ export const allUsers = createSelector(csrsMapping, certificatesMapping, (csrs,
   const users: Record<string, User> = {}
   const allUsernames: string[] = Object.values(csrs).map(u => u.username)
   const duplicateUsernames: string[] = allUsernames.filter((val, index) => allUsernames.indexOf(val) !== index)
-  console.log('duplicate Usernames selector', duplicateUsernames)
+
   Object.keys(csrs).map(pubKey => {
     const username = csrs[pubKey].username
-    const isDuplicated = duplicateUsernames.includes(username)
+
+    let isDuplicated: boolean
+    if (certs[pubKey]?.username) {
+      isDuplicated = false
+    } else {
+      isDuplicated = duplicateUsernames.includes(username)
+    }
+
     const isRegistered = Boolean(certs[pubKey])
     users[pubKey] = {
       ...csrs[pubKey],
@@ -131,6 +138,12 @@ export const ownerData = createSelector(getOldestParsedCerificate, ownerCert =>
   }
 })
 
+export const duplicateCerts = createSelector(certificatesMapping, certs => {
+  const allUsernames: string[] = Object.values(certs).map(u => u.username)
+  const uniqueUsernames = [...new Set(allUsernames)]
+  return Boolean(allUsernames.length !== uniqueUsernames.length)
+})
+
 export const usersSelectors = {
   certificates,
   certificatesMapping,
@@ -138,4 +151,5 @@ export const usersSelectors = {
   getOldestParsedCerificate,
   ownerData,
   allUsers,
+  duplicateCerts,
 }
diff --git a/packages/state-manager/src/utils/functions/sortPeers/sortPeers.ts b/packages/state-manager/src/utils/functions/sortPeers/sortPeers.ts
deleted file mode 100644
index c96c895203..0000000000
--- a/packages/state-manager/src/utils/functions/sortPeers/sortPeers.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { isDefined } from '@quiet/common'
-import { type NetworkStats } from '@quiet/types'
-
-/**
-This is the very simple algorithm for evaluating the most wanted peers.
-1. It takes the peers stats list that contains statistics for every peer our node was ever connected to.
-2. Two sorted arrays are created - one sorted by last seen and other by most uptime shared.
-3. Arrays are merged taking one element from list one and one element from the second list. Duplicates are ommited
-4. We end up with mix of last seen and most uptime descending array of peers, the it is enchanced to libp2p address.
- */
-export const sortPeers = (peersAddresses: string[], stats: NetworkStats[]): string[] => {
-  const lastSeenSorted = [...stats].sort((a, b) => {
-    return b.lastSeen - a.lastSeen
-  })
-  const mostUptimeSharedSorted = [...stats].sort((a, b) => {
-    return b.connectionTime - a.connectionTime
-  })
-
-  const mostWantedPeers: NetworkStats[] = []
-
-  for (let i = 0; i < stats.length; i++) {
-    const peerOne = lastSeenSorted[i]
-    const peerTwo = mostUptimeSharedSorted[i]
-
-    if (!mostWantedPeers.includes(peerOne)) {
-      mostWantedPeers.push(peerOne)
-    }
-
-    if (!mostWantedPeers.includes(peerTwo)) {
-      mostWantedPeers.push(peerTwo)
-    }
-  }
-
-  const peerList = mostWantedPeers.map(peerId => {
-    return peersAddresses.find(peerAddress => {
-      const id = peerAddress.split('/')[7]
-      if (id === peerId.peerId) {
-        peersAddresses.splice(peersAddresses.indexOf(peerAddress), 1)
-        return true
-      }
-    })
-  })
-
-  return peerList
-    .concat(peersAddresses)
-    .filter(address => address !== null)
-    .filter(isDefined)
-}
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 98337ca955..f5cbcd68b7 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/types@2.0.1-alpha.1...@quiet/types@2.0.1-alpha.2) (2023-10-09)
+
+**Note:** Version bump only for package @quiet/types
+
+
+
+
+
+## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/types@2.0.1-alpha.0...@quiet/types@2.0.1-alpha.1) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/types
+
+
+
+
+
+## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/types@2.0.0-alpha.3...@quiet/types@2.0.1-alpha.0) (2023-09-25)
+
+**Note:** Version bump only for package @quiet/types
+
+
+
+
+
 # [2.0.0-alpha.18](https://github.com/ZbayApp/monorepo/compare/@quiet/types@2.0.0-alpha.3...@quiet/types@2.0.0-alpha.18) (2023-10-04)
 
 **Note:** Version bump only for package @quiet/types
diff --git a/packages/types/package-lock.json b/packages/types/package-lock.json
index 83afac3852..e4bdf124db 100644
--- a/packages/types/package-lock.json
+++ b/packages/types/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/types",
-      "version": "2.0.0-alpha.18",
+      "version": "2.0.1-alpha.2",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/types/package.json b/packages/types/package.json
index 79ad3ae982..35027aa87e 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.1-alpha.2",
   "description": "Common monorepo types",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.0-alpha.18",
+    "@quiet/eslint-config": "^2.0.1-alpha.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
diff --git a/packages/types/src/identity.ts b/packages/types/src/identity.ts
index 09ff51adab..ac87af72b6 100644
--- a/packages/types/src/identity.ts
+++ b/packages/types/src/identity.ts
@@ -49,12 +49,19 @@ export interface CreateUserCsrPayload {
   dmPublicKey: string
   signAlg: string
   hashAlg: string
+  existingKeyPair?: CryptoKeyPair
 }
 
 export interface RegisterCertificatePayload {
   communityId: string
   nickname: string
   userCsr: UserCsr
+  isUsernameTaken?: boolean
+}
+
+export interface RegisterUsernamePayload {
+  nickname: string
+  isUsernameTaken?: boolean
 }
 
 export interface RegisterUserCertificatePayload {
@@ -92,7 +99,7 @@ export interface SaveOwnerCertificatePayload {
 
 export interface SavedOwnerCertificatePayload {
   communityId: string
-  network: { certificate: string; peers: string[] }
+  network: { certificate: string }
 }
 
 export interface SuccessfullRegistrarionResponse {