From 68c8ab01338500a0078301faeef2c3ed1b2d3dc1 Mon Sep 17 00:00:00 2001
From: fabienSvstr <fabien.sevestre@scille.fr>
Date: Tue, 17 Feb 2026 14:24:27 +0100
Subject: [PATCH] [MS] Add MFA requirement information on organization
 information page

---
 client/src/assets/images/person-check.svg     |   5 +
 client/src/assets/images/person-freeze.svg    |   5 +
 client/src/assets/images/person-remove.svg    |   5 +
 client/src/assets/images/shield-cancel.svg    |   3 +
 .../OrganizationConfigurationInformation.vue  |  18 +-
 .../OrganizationStorageInformation.vue        |   2 +-
 .../OrganizationUserInformation.vue           | 489 ++++++++++++------
 client/src/components/users/types.ts          |   9 +
 client/src/locales/en-US.json                 |  22 +-
 client/src/locales/fr-FR.json                 |  22 +-
 client/src/router/types.ts                    |   1 +
 .../OrganizationInformationPage.vue           |   6 +-
 12 files changed, 423 insertions(+), 164 deletions(-)
 create mode 100644 client/src/assets/images/person-check.svg
 create mode 100644 client/src/assets/images/person-freeze.svg
 create mode 100644 client/src/assets/images/person-remove.svg
 create mode 100644 client/src/assets/images/shield-cancel.svg

diff --git a/client/src/assets/images/person-check.svg b/client/src/assets/images/person-check.svg
new file mode 100644
index 00000000000..c6eae6b6987
--- /dev/null
+++ b/client/src/assets/images/person-check.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.94525 10.7774C10.5967 10.7775 12.2087 11.2005 13.541 11.9727C11.8711 13.1542 10.7784 15.0995 10.7783 17.296C10.7783 17.572 10.7975 17.8443 10.831 18.1114H2.22259C2.04674 18.1137 1.87262 18.0764 1.71283 18.003C1.55294 17.9295 1.41155 17.8207 1.29876 17.6856C1.05058 17.3889 0.950272 16.984 1.02435 16.5743C1.34669 14.7862 2.3525 13.2841 3.93353 12.2296C5.33832 11.2934 7.11841 10.7774 8.94525 10.7774Z" fill="var(--fill-color, #000000)"/>
+<path d="M8.94525 1.00006C10.0909 1.00013 11.1288 1.44194 11.872 2.2442C12.6244 3.0566 12.9909 4.15073 12.9042 5.3233C12.7318 7.65707 10.959 9.55555 8.94525 9.55573C6.93131 9.55573 5.15496 7.65668 4.98529 5.32233C4.89973 4.13906 5.26381 3.04267 6.01165 2.23639C6.75147 1.43903 7.79341 1.00006 8.94525 1.00006Z" fill="var(--fill-color, #000000)"/>
+<path d="M17.2966 11.5927C14.1516 11.5927 11.5929 14.1514 11.5929 17.2964C11.5929 20.4413 14.1516 23.0001 17.2966 23.0001C20.4416 23.0001 23.0003 20.4413 23.0003 17.2964C23.0003 14.1514 20.4416 11.5927 17.2966 11.5927ZM20.265 15.3848L16.5795 19.7723C16.5391 19.8204 16.4888 19.8593 16.432 19.8863C16.3752 19.9133 16.3133 19.9278 16.2505 19.9288H16.2431C16.1816 19.9288 16.1208 19.9159 16.0646 19.8908C16.0084 19.8658 15.9581 19.8292 15.917 19.7835L14.3375 18.0285C14.2974 17.986 14.2662 17.9358 14.2457 17.8811C14.2253 17.8263 14.216 17.768 14.2184 17.7095C14.2208 17.6511 14.2348 17.5938 14.2597 17.5408C14.2846 17.4879 14.3198 17.4405 14.3633 17.4014C14.4067 17.3623 14.4576 17.3323 14.5128 17.3131C14.5681 17.2939 14.6266 17.2859 14.6849 17.2897C14.7433 17.2934 14.8003 17.3088 14.8526 17.3349C14.9049 17.361 14.9515 17.3973 14.9896 17.4417L16.2315 18.8215L19.5932 14.8205C19.6686 14.7333 19.7752 14.6793 19.8901 14.6701C20.005 14.661 20.1189 14.6974 20.2072 14.7715C20.2955 14.8457 20.351 14.9516 20.3618 15.0663C20.3726 15.1811 20.3378 15.2955 20.265 15.3848Z" fill="var(--fill-color, #000000)"/>
+</svg>
diff --git a/client/src/assets/images/person-freeze.svg b/client/src/assets/images/person-freeze.svg
new file mode 100644
index 00000000000..a2456328e5a
--- /dev/null
+++ b/client/src/assets/images/person-freeze.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.94493 10.7778C10.5965 10.7778 12.2087 11.2007 13.541 11.973C11.8712 13.1546 10.7783 15.0998 10.7783 17.2964C10.7783 17.5723 10.7973 17.8441 10.8308 18.1112H2.2227C2.0468 18.1134 1.87247 18.0765 1.71265 18.003C1.5529 17.9295 1.41161 17.8212 1.29888 17.6863C1.05061 17.3895 0.950256 16.9837 1.02435 16.5738C1.34678 14.7857 2.35315 13.2837 3.93429 12.2292C5.339 11.2932 7.11824 10.7779 8.94493 10.7778Z" fill="var(--fill-color, #000000)"/>
+<path d="M8.94493 1.00006C10.0908 1.00006 11.1291 1.4421 11.8724 2.24456C12.6248 3.05695 12.9911 4.15066 12.9044 5.32319C12.732 7.65711 10.9588 9.55562 8.94493 9.55562C6.9311 9.55548 5.15513 7.65663 4.98543 5.3224C4.89988 4.13914 5.26406 3.04289 6.01191 2.23661C6.75168 1.43925 7.79314 1.00012 8.94493 1.00006Z" fill="var(--fill-color, #000000)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2968 11.5927C20.4418 11.5927 23.0005 14.1514 23.0005 17.2964C23.0005 20.4413 20.4418 23.0001 17.2968 23.0001C14.1518 23.0001 11.5931 20.4413 11.5931 17.2964C11.5931 14.1514 14.1518 11.5927 17.2968 11.5927ZM17.2912 13.1817C17.1817 13.1818 17.0766 13.2251 16.9992 13.3027C16.9218 13.3803 16.8783 13.4858 16.8782 13.5955V14.1055C16.7557 14.07 16.6376 14.0203 16.5281 13.9543C16.4817 13.9263 16.4298 13.9076 16.3761 13.8994C16.3225 13.8913 16.2673 13.8935 16.2146 13.9066C16.162 13.9197 16.1126 13.9436 16.069 13.9758C16.0254 14.0081 15.9887 14.0487 15.9608 14.0952C15.9328 14.1418 15.914 14.1934 15.9059 14.2472C15.8978 14.3009 15.9 14.3559 15.913 14.4087C15.9261 14.4614 15.9501 14.5114 15.9823 14.5551C16.0143 14.5986 16.0546 14.6354 16.1008 14.6633C16.3399 14.8076 16.6038 14.9056 16.8782 14.9554V16.5786L15.4762 15.7662C15.5703 15.503 15.6181 15.2255 15.613 14.9458C15.611 14.8373 15.5662 14.7338 15.4889 14.6578C15.4117 14.5818 15.3075 14.5392 15.1993 14.5392H15.1913C15.1371 14.5402 15.0835 14.5517 15.0338 14.5734C14.9841 14.5951 14.9393 14.6266 14.9017 14.6657C14.8641 14.7049 14.834 14.7512 14.8141 14.8018C14.7944 14.8524 14.7853 14.9066 14.7863 14.9609C14.7886 15.0894 14.7723 15.2174 14.7417 15.3421L14.2134 15.0373C14.1664 15.0093 14.1147 14.9909 14.0606 14.9832C14.0065 14.9755 13.9512 14.9789 13.8983 14.9928C13.8454 15.0066 13.7954 15.0304 13.7519 15.0636C13.7083 15.0968 13.6718 15.1386 13.6444 15.1861C13.6171 15.2336 13.5997 15.2861 13.5927 15.3405C13.5858 15.3949 13.5893 15.4507 13.6039 15.5036C13.6184 15.5564 13.6433 15.6061 13.6771 15.6492C13.7108 15.6924 13.7534 15.7283 13.8012 15.7551L14.3288 16.0598C14.2365 16.1485 14.1344 16.2261 14.0224 16.2882C13.9745 16.3142 13.9325 16.35 13.8983 16.3924C13.864 16.435 13.838 16.484 13.8227 16.5364C13.8074 16.5888 13.8024 16.6437 13.8084 16.698C13.8143 16.7523 13.8313 16.8053 13.8577 16.8531C13.8841 16.901 13.92 16.9433 13.9627 16.9773C14.0054 17.0112 14.0544 17.0364 14.1068 17.0513C14.1592 17.0662 14.2141 17.0705 14.2683 17.064C14.3224 17.0575 14.3744 17.0399 14.4219 17.0131C14.666 16.8776 14.8822 16.698 15.0624 16.4847L16.4653 17.2964L15.0632 18.108C14.8829 17.8946 14.6661 17.7144 14.4219 17.5788C14.3746 17.5522 14.3222 17.5351 14.2683 17.5287C14.2142 17.5223 14.1592 17.5265 14.1068 17.5414C14.0544 17.5563 14.0054 17.5815 13.9627 17.6154C13.92 17.6494 13.8841 17.6917 13.8577 17.7396C13.8313 17.7874 13.8151 17.8404 13.8092 17.8947C13.8032 17.949 13.8082 18.0038 13.8235 18.0563C13.8388 18.1087 13.864 18.1578 13.8983 18.2003C13.9325 18.2427 13.9746 18.2785 14.0224 18.3045C14.1344 18.3666 14.2373 18.4434 14.3296 18.5321L13.8012 18.8393L13.7336 18.8862C13.7129 18.9039 13.6939 18.9243 13.6771 18.9459C13.6434 18.989 13.6184 19.0388 13.6039 19.0915C13.5894 19.1443 13.5858 19.1996 13.5927 19.2538C13.5997 19.3082 13.6171 19.3607 13.6444 19.4082C13.6718 19.4557 13.7084 19.4975 13.7519 19.5307C13.7953 19.5639 13.8454 19.5877 13.8983 19.6016C13.9512 19.6154 14.0065 19.6188 14.0606 19.6111C14.1148 19.6034 14.1672 19.5851 14.2142 19.557L14.7417 19.2506C14.7725 19.3753 14.7885 19.5032 14.7863 19.6318C14.7844 19.7414 14.8258 19.8472 14.9017 19.9262C14.9776 20.0052 15.0819 20.0514 15.1913 20.0535H15.1993C15.3075 20.0535 15.4117 20.0102 15.4889 19.9342C15.5659 19.8582 15.6102 19.7552 15.6123 19.6469C15.6174 19.3671 15.5703 19.089 15.4762 18.8257L16.8782 18.0133V19.6366C16.6038 19.6863 16.34 19.7851 16.1008 19.9294C16.0072 19.9861 15.9394 20.0776 15.913 20.184C15.8867 20.2906 15.9042 20.4034 15.9608 20.4975C16.0173 20.5915 16.1083 20.6596 16.2146 20.6861C16.321 20.7126 16.4342 20.6951 16.5281 20.6384C16.6377 20.5724 16.7556 20.5219 16.8782 20.4864V20.9972C16.8783 21.107 16.9218 21.2124 16.9992 21.2901C17.0766 21.3676 17.1817 21.4109 17.2912 21.411C17.4008 21.411 17.5066 21.3678 17.584 21.2901C17.6615 21.2124 17.7049 21.107 17.705 20.9972V20.4864C17.8276 20.5219 17.9455 20.5724 18.0551 20.6384C18.1489 20.695 18.2615 20.7124 18.3678 20.6861C18.4742 20.6597 18.5659 20.5916 18.6224 20.4975C18.679 20.4034 18.6958 20.2906 18.6694 20.184C18.643 20.0775 18.5754 19.9861 18.4816 19.9294C18.2425 19.7851 17.9794 19.6863 17.705 19.6366V18.0133L19.1062 18.8257C19.012 19.089 18.9651 19.367 18.9702 19.6469C18.9722 19.7554 19.017 19.8589 19.0943 19.935C19.1716 20.0109 19.2757 20.0535 19.384 20.0535H19.3919C19.4461 20.0525 19.4998 20.041 19.5495 20.0193C19.5991 19.9976 19.644 19.9661 19.6816 19.927C19.7191 19.8879 19.7485 19.8414 19.7683 19.7909C19.7881 19.7404 19.7979 19.6861 19.7969 19.6318C19.7946 19.5031 19.81 19.3747 19.8407 19.2498L20.3675 19.5546C20.4145 19.5849 20.4675 19.6058 20.5226 19.6151C20.5776 19.6243 20.6339 19.6226 20.6881 19.6095C20.7424 19.5963 20.7938 19.5722 20.8385 19.5387C20.8833 19.5051 20.9204 19.4623 20.9483 19.4138C20.9763 19.3653 20.9942 19.3118 21.0008 19.2562C21.0075 19.2006 21.003 19.1444 20.9873 19.0907C20.9717 19.037 20.9456 18.9867 20.9101 18.9435C20.8923 18.9218 20.8722 18.9022 20.8505 18.8846L20.7812 18.8393L20.2529 18.5337C20.3453 18.4447 20.4486 18.3675 20.5608 18.3053C20.6557 18.2517 20.726 18.1629 20.7558 18.0579C20.7855 17.9528 20.7726 17.8399 20.72 17.7443C20.6673 17.6488 20.5787 17.5777 20.4741 17.547C20.3957 17.5241 20.313 17.5256 20.2362 17.5494L20.1614 17.5804C19.9169 17.7161 19.6996 17.8959 19.5192 18.1096L18.1164 17.2964L19.5192 16.4839C19.6995 16.6976 19.9161 16.8775 20.1606 17.0131C20.208 17.0399 20.2601 17.0575 20.3141 17.064C20.3683 17.0705 20.424 17.0662 20.4765 17.0513C20.5288 17.0364 20.5779 17.0112 20.6205 16.9773C20.6631 16.9433 20.6984 16.9009 20.7247 16.8531C20.7511 16.8053 20.7681 16.7523 20.7741 16.698C20.78 16.6437 20.775 16.5889 20.7597 16.5364C20.7444 16.484 20.7192 16.4349 20.6849 16.3924C20.6508 16.35 20.6086 16.3142 20.5608 16.2882C20.4485 16.2259 20.3454 16.1488 20.2529 16.0598L20.7804 15.7543L20.7812 15.7551C20.83 15.7289 20.873 15.6932 20.9078 15.65C20.9425 15.6068 20.9681 15.5569 20.9833 15.5036C20.9985 15.4502 21.0028 15.394 20.9961 15.3389C20.9893 15.284 20.9719 15.2309 20.9444 15.1829C20.9167 15.1349 20.8795 15.093 20.8353 15.0596C20.7911 15.0261 20.7403 15.0015 20.6865 14.988C20.6329 14.9745 20.5772 14.9723 20.5226 14.9808C20.4682 14.9893 20.4159 15.0083 20.369 15.0373L19.8407 15.3429C19.8101 15.2185 19.7947 15.0907 19.7969 14.9625C19.7981 14.9082 19.7888 14.854 19.7691 14.8034C19.7494 14.7526 19.72 14.7058 19.6823 14.6665C19.6447 14.6272 19.5993 14.5961 19.5495 14.5742C19.4997 14.5524 19.4462 14.5403 19.3919 14.5392H19.384C19.2757 14.5392 19.1716 14.5825 19.0943 14.6586C19.0173 14.7345 18.9731 14.8375 18.971 14.9458C18.9659 15.2253 19.0123 15.5032 19.1062 15.7662L17.705 16.5786V14.9554C17.9793 14.9056 18.2426 14.8075 18.4816 14.6633C18.5754 14.6067 18.643 14.5152 18.6694 14.4087C18.6958 14.3021 18.679 14.1893 18.6224 14.0952C18.5659 14.0011 18.4742 13.9331 18.3678 13.9066C18.2615 13.8803 18.1489 13.8977 18.0551 13.9543C17.9456 14.0203 17.8275 14.07 17.705 14.1055V13.5955C17.7049 13.4858 17.6615 13.3803 17.584 13.3027C17.5066 13.225 17.4008 13.1817 17.2912 13.1817Z" fill="var(--fill-color, #000000)"/>
+</svg>
diff --git a/client/src/assets/images/person-remove.svg b/client/src/assets/images/person-remove.svg
new file mode 100644
index 00000000000..17d0c385a67
--- /dev/null
+++ b/client/src/assets/images/person-remove.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.94468 10.7778C10.5962 10.7778 12.2085 11.2007 13.5407 11.973C11.871 13.1546 10.778 15.0998 10.778 17.2964C10.778 17.5723 10.7971 17.8441 10.8305 18.1112H2.22246C2.04656 18.1134 1.87223 18.0765 1.7124 18.003C1.55265 17.9295 1.41136 17.8212 1.29863 17.6863C1.05037 17.3895 0.950012 16.9837 1.02411 16.5738C1.34654 14.7857 2.35291 13.2837 3.93405 12.2292C5.33876 11.2932 7.118 10.7779 8.94468 10.7778Z" fill="var(--fill-color, #000000)"/>
+<path d="M8.94468 1.00006C10.0905 1.00006 11.1289 1.4421 11.8721 2.24456C12.6245 3.05695 12.9909 4.15066 12.9042 5.32319C12.7318 7.65711 10.9586 9.55562 8.94468 9.55562C6.93086 9.55548 5.15489 7.65663 4.98519 5.3224C4.89964 4.13914 5.26382 3.04289 6.01167 2.23661C6.75144 1.43925 7.7929 1.00012 8.94468 1.00006Z" fill="var(--fill-color, #000000)"/>
+<path d="M17.2965 11.5927C14.1516 11.5927 11.5928 14.1514 11.5928 17.2964C11.5928 20.4413 14.1516 23.0001 17.2965 23.0001C20.4415 23.0001 23.0002 20.4413 23.0002 17.2964C23.0002 14.1514 20.4415 11.5927 17.2965 11.5927ZM19.3617 18.7412C19.4041 18.7815 19.4381 18.83 19.4615 18.8836C19.485 18.9373 19.4974 18.9951 19.4982 19.0537C19.4989 19.1122 19.4879 19.1703 19.4659 19.2246C19.4438 19.2788 19.4111 19.3281 19.3697 19.3695C19.3283 19.4109 19.279 19.4436 19.2248 19.4657C19.1705 19.4878 19.1124 19.4987 19.0539 19.498C18.9953 19.4972 18.9375 19.4848 18.8838 19.4613C18.8302 19.4379 18.7817 19.4039 18.7414 19.3615L17.2965 17.9169L15.8517 19.3615C15.7687 19.4403 15.6583 19.4836 15.5439 19.4821C15.4295 19.4806 15.3202 19.4345 15.2393 19.3536C15.1584 19.2727 15.1123 19.1634 15.1108 19.049C15.1093 18.9346 15.1526 18.8242 15.2314 18.7412L16.676 17.2964L15.2314 15.8515C15.1526 15.7686 15.1093 15.6581 15.1108 15.5437C15.1123 15.4293 15.1584 15.32 15.2393 15.2391C15.3202 15.1582 15.4295 15.1121 15.5439 15.1106C15.6583 15.1091 15.7687 15.1524 15.8517 15.2312L17.2965 16.6758L18.7414 15.2312C18.8243 15.1524 18.9348 15.1091 19.0492 15.1106C19.1636 15.1121 19.2729 15.1582 19.3538 15.2391C19.4347 15.32 19.4808 15.4293 19.4823 15.5437C19.4838 15.6581 19.4405 15.7686 19.3617 15.8515L17.9171 17.2964L19.3617 18.7412Z" fill="var(--fill-color, #000000)"/>
+</svg>
diff --git a/client/src/assets/images/shield-cancel.svg b/client/src/assets/images/shield-cancel.svg
new file mode 100644
index 00000000000..0d20aff3956
--- /dev/null
+++ b/client/src/assets/images/shield-cancel.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0002 1.5C12.1066 1.50003 12.2118 1.52259 12.3088 1.56641C16.0925 3.27547 17.7854 3.8018 21.84 4.5293C22.0052 4.55888 22.1561 4.64238 22.2678 4.76758C22.3795 4.89281 22.4456 5.05225 22.4562 5.21973C22.6367 8.08426 22.2515 10.7538 21.3107 13.1533C20.5423 15.1099 19.4043 16.9002 17.9592 18.4268C15.4528 21.0859 12.792 22.2409 12.2844 22.4453C12.104 22.5183 11.9023 22.5183 11.7219 22.4453C11.2138 22.2408 8.55319 21.0857 6.04707 18.4268C4.59955 16.9008 3.45907 15.1105 2.68867 13.1533C1.74789 10.7538 1.36269 8.08426 1.54316 5.21973C1.55378 5.05224 1.62089 4.89281 1.73262 4.76758C1.84434 4.64248 1.99524 4.55884 2.16035 4.5293C6.21468 3.80185 7.90721 3.2753 11.6906 1.56641C11.7877 1.52253 11.8937 1.5 12.0002 1.5ZM16.0002 8C15.7073 7.70715 15.2326 7.70725 14.9396 8L12.0002 10.9395L9.00019 8C8.70734 7.70714 8.23255 7.70722 7.93965 8C7.64675 8.29289 7.64675 8.76765 7.93965 9.06055L10.9396 12L7.93965 14.9395C7.64675 15.2323 7.64675 15.7071 7.93965 16C8.23255 16.2927 8.70736 16.2928 9.00019 16L12.0002 13.0605L14.9396 16C15.2326 16.2927 15.7074 16.2928 16.0002 16C16.293 15.7072 16.2929 15.2323 16.0002 14.9395L13.0607 12L16.0002 9.06055C16.2929 8.76767 16.293 8.29285 16.0002 8Z" fill="var(--fill-color, #000000)"/>
+</svg>
diff --git a/client/src/components/organizations/OrganizationConfigurationInformation.vue b/client/src/components/organizations/OrganizationConfigurationInformation.vue
index e2de8a155e7..a5507363c53 100644
--- a/client/src/components/organizations/OrganizationConfigurationInformation.vue
+++ b/client/src/components/organizations/OrganizationConfigurationInformation.vue
@@ -38,6 +38,22 @@
             {{ orgInfo.hasUserLimit ? orgInfo.userLimit : $msTranslate('OrganizationPage.configuration.unlimited') }}
           </div>
         </div>
+        <!-- MFA requirement -->
+        <div class="info-list-item">
+          <ion-label class="info-list-item__title body">
+            {{ $msTranslate('OrganizationPage.configuration.mfaRequired') }}
+          </ion-label>
+          <div
+            class="info-list-item__value cell-title"
+            :class="orgInfo.mfaRequired ? 'success' : 'warning'"
+          >
+            {{
+              orgInfo.mfaRequired
+                ? $msTranslate('OrganizationPage.configuration.allowed')
+                : $msTranslate('OrganizationPage.configuration.forbidden')
+            }}
+          </div>
+        </div>
         <!-- Server addr -->
         <div class="info-list-item server-address">
           <ion-text class="info-list-item__title server-address__title body">
@@ -115,7 +131,7 @@ async function copyAddress(address: string): Promise<void> {
   gap: 1rem;
   width: 100%;
   max-width: 30rem;
-  border-radius: var(--parsec-radius-12);
+  border-radius: var(--parsec-radius-18);
   height: fit-content;
   box-shadow: var(--parsec-shadow-input);
   padding: 1.5rem;
diff --git a/client/src/components/organizations/OrganizationStorageInformation.vue b/client/src/components/organizations/OrganizationStorageInformation.vue
index 234028abd92..d6669d634b1 100644
--- a/client/src/components/organizations/OrganizationStorageInformation.vue
+++ b/client/src/components/organizations/OrganizationStorageInformation.vue
@@ -76,7 +76,7 @@ defineProps<{
   gap: 1rem;
   width: 100%;
   max-width: 30rem;
-  border-radius: var(--parsec-radius-12);
+  border-radius: var(--parsec-radius-18);
   height: fit-content;
   box-shadow: var(--parsec-shadow-input);
   padding: 1.5rem;
diff --git a/client/src/components/organizations/OrganizationUserInformation.vue b/client/src/components/organizations/OrganizationUserInformation.vue
index b97d7233808..cf166bb2dcb 100644
--- a/client/src/components/organizations/OrganizationUserInformation.vue
+++ b/client/src/components/organizations/OrganizationUserInformation.vue
@@ -3,100 +3,179 @@
 <template>
   <div class="organization-users">
     <div class="card-header">
-      <ion-title class="card-header__title title-h3">
-        {{ $msTranslate('OrganizationPage.users.title') }}
-      </ion-title>
-
-      <ion-button
-        fill="clear"
-        class="card-header__button user-invite-button"
-        @click="inviteUser"
-        v-show="userInfo.currentProfile === UserProfile.Admin"
-      >
-        <ion-icon
-          :icon="personAdd"
-          class="user-invite-button__icon"
-        />
-      </ion-button>
+      <div class="card-header-text">
+        <ion-title class="card-header-text__title title-h3">
+          {{ $msTranslate('OrganizationPage.users.title') }}
+        </ion-title>
+        <ion-text class="card-header-text__subtitle subtitles-sm">
+          {{ $msTranslate('OrganizationPage.users.subtitle') }}
+        </ion-text>
+      </div>
     </div>
 
     <div class="card-content">
-      <div
-        button
-        class="users-list"
-        @click="navigateTo(Routes.Users)"
-      >
+      <div class="users-list users-status">
+        <ion-text class="users-list__title title-h5">
+          {{ $msTranslate('OrganizationPage.users.listTitle') }}
+        </ion-text>
         <!-- Active users -->
-        <div class="users-list-item">
-          <ion-text class="users-list-item__title title-h2">
-            {{ orgInfo.users.active }}
-          </ion-text>
-          <ion-text class="users-list-item__description subtitles-sm">
+        <div
+          class="users-list-item"
+          @click="openInformationUserModal(UserFilterType.Active)"
+        >
+          <div class="icon-container">
+            <ms-image
+              :image="PersonCheck"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
             {{ $msTranslate({ key: 'OrganizationPage.users.activeUsers', count: orgInfo.users.active }) }}
           </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.active }}
+          </ion-text>
         </div>
 
         <!-- Revoked -->
-        <div class="users-list-item">
-          <ion-text class="users-list-item__title title-h2">
-            {{ orgInfo.users.revoked }}
-          </ion-text>
-          <ion-text class="users-list-item__description subtitles-sm">
+        <div
+          class="users-list-item"
+          @click="openInformationUserModal(UserFilterType.Revoked)"
+        >
+          <div class="icon-container">
+            <ms-image
+              :image="PersonRemove"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
             {{ $msTranslate({ key: 'OrganizationPage.users.revokedUsers', count: orgInfo.users.revoked }) }}
           </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.revoked }}
+          </ion-text>
         </div>
 
         <!-- Frozen -->
-        <div class="users-list-item">
-          <ion-text class="users-list-item__title title-h2">
-            {{ orgInfo.users.frozen }}
-          </ion-text>
-          <ion-text class="users-list-item__description subtitles-sm">
+        <div
+          class="users-list-item"
+          @click="openInformationUserModal(UserFilterType.Frozen)"
+        >
+          <div class="icon-container">
+            <ms-image
+              :image="PersonFreeze"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
             {{ $msTranslate({ key: 'OrganizationPage.users.frozenUsers', count: orgInfo.users.frozen }) }}
           </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.frozen }}
+          </ion-text>
         </div>
       </div>
 
-      <div class="user-active">
-        <div class="user-active-list">
-          <!-- Admin -->
-          <div class="user-active-list-item">
-            <user-profile-tag :profile="UserProfile.Admin" />
-            <ion-text class="user-active-list-item__value title-h4">
-              {{ orgInfo.users.admins }}
-            </ion-text>
-          </div>
-          <!-- Standard -->
-          <div class="user-active-list-item">
-            <user-profile-tag :profile="UserProfile.Standard" />
-            <ion-text class="user-active-list-item__value title-h4">
-              {{ orgInfo.users.standards }}
-            </ion-text>
+      <div class="users-list users-active">
+        <ion-text class="users-list__title title-h5">
+          {{ $msTranslate('OrganizationPage.users.profileTitle') }}
+        </ion-text>
+        <!-- Active users -->
+        <div
+          class="users-list-item"
+          @click="openInformationUserModal(UserFilterType.Admins)"
+        >
+          <div class="icon-container">
+            <ion-icon
+              :icon="flower"
+              class="users-list-item__icon"
+            />
           </div>
-          <!-- Outsiders if allowed -->
-          <div
-            v-if="orgInfo.outsidersAllowed"
-            class="user-active-list-item"
-          >
-            <user-profile-tag :profile="UserProfile.Outsider" />
-            <ion-text class="user-active-list-item__value title-h4">
-              {{ orgInfo.users.outsiders }}
-            </ion-text>
+          <ion-text class="users-list-item__title subtitles-sm">
+            {{ $msTranslate({ key: 'OrganizationPage.users.adminUsers', count: orgInfo.users.admins }) }}
+          </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.admins }}
+          </ion-text>
+        </div>
+
+        <div
+          class="users-list-item"
+          @click="openInformationUserModal(UserFilterType.Standards)"
+        >
+          <div class="icon-container">
+            <ion-icon
+              :icon="personCircle"
+              class="users-list-item__icon"
+            />
           </div>
+          <ion-text class="users-list-item__title subtitles-sm">
+            {{ $msTranslate({ key: 'OrganizationPage.users.memberUsers', count: orgInfo.users.standards }) }}
+          </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.standards }}
+          </ion-text>
         </div>
 
-        <ion-button
-          fill="clear"
-          class="user-active__button"
-          @click="navigateTo(Routes.Users)"
+        <div
+          class="users-list-item"
+          v-if="orgInfo.outsidersAllowed"
+          @click="openInformationUserModal(UserFilterType.Outsiders)"
         >
-          {{ $msTranslate('OrganizationPage.users.seeUsers') }}
-        </ion-button>
+          <div class="icon-container">
+            <ion-icon
+              :icon="idCard"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
+            {{ $msTranslate({ key: 'OrganizationPage.users.externalUsers', count: orgInfo.users.outsiders }) }}
+          </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.outsiders }}
+          </ion-text>
+        </div>
+      </div>
+
+      <div class="users-list users-mfa">
+        <ion-text class="users-list__title title-h5">
+          {{ $msTranslate('OrganizationPage.users.mfaTitle') }}
+        </ion-text>
+        <!-- MFA active -->
+        <div class="users-list-item">
+          <div class="icon-container">
+            <ion-icon
+              :icon="shieldCheckmark"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
+            {{ $msTranslate({ key: 'OrganizationPage.users.mfaActive', count: orgInfo.users.mfaActive }) }}
+          </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.mfaActive }}
+          </ion-text>
+        </div>
+
+        <div class="users-list-item">
+          <div class="icon-container">
+            <ms-image
+              :image="ShieldCancel"
+              class="users-list-item__icon"
+            />
+          </div>
+          <ion-text class="users-list-item__title subtitles-sm">
+            {{ $msTranslate({ key: 'OrganizationPage.users.mfaInactive', count: orgInfo.users.mfaInactive }) }}
+          </ion-text>
+          <ion-text class="users-list-item__number title-h4">
+            {{ orgInfo.users.mfaInactive }}
+          </ion-text>
+        </div>
       </div>
 
       <div
         class="invitation-card-list"
-        v-show="userInfo.currentProfile === UserProfile.Admin"
+        v-show="userInfo.currentProfile === UserProfile.Admin && isSmallDisplay"
       >
         <div
           button
@@ -129,17 +208,47 @@
         </div>
       </div>
     </div>
+
+    <div class="card-buttons">
+      <ion-button
+        fill="clear"
+        class="button-secondary"
+        id="see-users-button"
+        @click="navigateTo(Routes.Users)"
+      >
+        {{ $msTranslate('OrganizationPage.users.seeUsers') }}
+      </ion-button>
+
+      <ion-button
+        fill="clear"
+        class="button-secondary"
+        id="user-invite-button"
+        @click="inviteUser"
+        v-show="userInfo.currentProfile === UserProfile.Admin"
+      >
+        <ion-icon
+          :icon="personAdd"
+          class="button-secondary__icon"
+        />
+        {{ $msTranslate('OrganizationPage.users.addUser') }}
+      </ion-button>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import UserProfileTag from '@/components/users/UserProfileTag.vue';
+import PersonCheck from '@/assets/images/person-check.svg?raw';
+import PersonFreeze from '@/assets/images/person-freeze.svg?raw';
+import PersonRemove from '@/assets/images/person-remove.svg?raw';
+import ShieldCancel from '@/assets/images/shield-cancel.svg?raw';
+import { UserFilterType } from '@/components/users/types';
 import { ClientInfo, listAsyncEnrollments, listUserInvitations, OrganizationInfo, UserProfile } from '@/parsec';
 import { navigateTo, Routes } from '@/router';
 import { EventData, EventDistributor, EventDistributorKey, Events } from '@/services/eventDistributor';
 import { InvitationView } from '@/views/invitations/types';
 import { IonButton, IonIcon, IonText, IonTitle } from '@ionic/vue';
-import { link, mailUnread, personAdd } from 'ionicons/icons';
+import { flower, idCard, link, mailUnread, personAdd, personCircle, shieldCheckmark } from 'ionicons/icons';
+import { MsImage, useWindowSize } from 'megashark-lib';
 import { inject, onMounted, onUnmounted, ref, Ref } from 'vue';
 
 defineProps<{
@@ -147,6 +256,7 @@ defineProps<{
   orgInfo: OrganizationInfo;
 }>();
 
+const { isSmallDisplay } = useWindowSize();
 const invitationCount = ref(0);
 const asyncEnrollmentsCount = ref(0);
 const eventDistributor: Ref<EventDistributor> = inject(EventDistributorKey)!;
@@ -182,52 +292,95 @@ async function goToInvitations(view: InvitationView): Promise<void> {
 async function inviteUser(): Promise<void> {
   await navigateTo(Routes.Invitations, { query: { openInvite: true } });
 }
+
+async function openInformationUserModal(filterType: UserFilterType): Promise<void> {
+  await navigateTo(Routes.Users, { query: { userFilter: filterType } });
+}
 </script>
 
 <style scoped lang="scss">
 .organization-users {
   display: flex;
   flex-direction: column;
+  gap: 1.5rem;
+  padding: 1.5rem;
   background: var(--parsec-color-light-secondary-white);
-  align-items: center;
-  gap: 1rem;
   width: 100%;
-  max-width: 30rem;
-  border-radius: var(--parsec-radius-12);
   height: fit-content;
+  border-radius: var(--parsec-radius-18);
   box-shadow: var(--parsec-shadow-input);
-  padding: 1.5rem;
-}
+  position: relative;
+  max-width: 80rem;
 
-.card-header {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  gap: 0.75rem;
+  @include ms.responsive-breakpoint('md') {
+    max-width: 30rem;
+  }
 
-  &__title {
-    color: var(--parsec-color-light-secondary-text);
+  .card-header {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    justify-content: space-between;
+    gap: 0.75rem;
+
+    &-text {
+      display: flex;
+      flex-direction: column;
+      gap: 1rem;
+
+      &__title {
+        color: var(--parsec-color-light-secondary-text);
+      }
+
+      &__subtitle {
+        color: var(--parsec-color-light-secondary-hard-grey);
+      }
+    }
   }
 
-  &__button {
-    align-self: stretch;
-    color: var(--parsec-color-light-secondary-soft-text);
-    border-radius: var(--parsec-radius-8);
-    border: 1px solid var(--parsec-color-light-secondary-medium);
-    --background-hover: var(--parsec-color-light-secondary-background);
-    box-shadow: var(--parsec-shadow-input);
+  .card-content {
+    display: flex;
+    gap: 1rem;
 
-    &::part(native) {
-      padding: 0.625rem 1rem;
+    @include ms.responsive-breakpoint('lg') {
+      flex-wrap: wrap;
     }
   }
-}
 
-.card-content {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  gap: 1rem;
+  .card-buttons {
+    display: flex;
+    position: absolute;
+    top: 1.5rem;
+    right: 1.5rem;
+    gap: 0.75rem;
+
+    @include ms.responsive-breakpoint('md') {
+      position: initial;
+      justify-content: center;
+      flex-direction: column;
+    }
+
+    .button-secondary {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      color: var(--parsec-color-light-secondary-soft-text);
+      --background-hover: var(--parsec-color-light-secondary-background);
+      border: 1px solid var(--parsec-color-light-secondary-medium);
+      box-shadow: var(--parsec-shadow-input);
+      border-radius: var(--parsec-radius-8);
+
+      &::part(native) {
+        padding: 0.625rem 0.75rem;
+      }
+
+      &__icon {
+        color: var(--parsec-color-light-secondary-soft-text);
+        font-size: 1rem;
+        margin-right: 0.25rem;
+      }
+    }
+  }
 }
 
 .invitation-card-list {
@@ -277,88 +430,112 @@ async function inviteUser(): Promise<void> {
   }
 }
 
-.organization-users {
+.users-list {
+  display: flex;
+  justify-content: flex-start;
   flex-direction: column;
-  gap: 1rem;
+  padding: 0.75rem;
+  gap: 0.75rem;
+  border-radius: var(--parsec-radius-12);
+  background: var(--parsec-color-light-secondary-background);
+  box-shadow: var(--parsec-shadow-input);
+  width: 100%;
+
+  &__title {
+    color: var(--parsec-color-light-secondary-text);
+  }
 
-  .users-list {
+  &-item {
     display: flex;
-    justify-content: space-around;
-    gap: 0.5rem;
+    gap: 0.75rem;
+    width: 100%;
+    align-items: center;
+    background: var(--parsec-color-light-secondary-white);
+    border-radius: var(--parsec-radius-8);
+    padding: 0.75rem 1rem 0.75rem 0.5rem;
+    min-width: 14.375rem;
 
-    &-item {
+    .icon-container {
+      border-radius: var(--parsec-radius-8);
       display: flex;
-      gap: 0.25rem;
-      width: 100%;
-      flex-direction: column;
       align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+      padding: 0.375rem;
+    }
 
-      &__title {
-        color: var(--parsec-color-light-primary-700);
-      }
+    &__icon {
+      flex-shrink: 0;
+      width: 1.125rem;
+      height: 1.125rem;
+      font-size: 1.125rem;
+    }
 
-      &__description {
-        color: var(--parsec-color-light-secondary-grey);
-      }
+    &__title {
+      color: var(--parsec-color-light-secondary-text);
+      width: 100%;
+    }
+
+    &__number {
+      color: var(--parsec-color-light-secondary-text);
+    }
+
+    &:hover {
+      outline: 1px solid var(--parsec-color-light-secondary-light);
+      box-shadow: var(--parsec-shadow-input);
+      cursor: pointer;
     }
   }
+}
 
-  .user-invite-button {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    color: var(--parsec-color-light-secondary-soft-text);
-    --background-hover: var(--parsec-color-light-secondary-background);
-    border: 1px solid var(--parsec-color-light-secondary-medium);
-    box-shadow: var(--parsec-shadow-input);
-    border-radius: var(--parsec-radius-8);
+.users-status {
+  .users-list-item {
+    &:nth-of-type(1) .icon-container {
+      background: var(--parsec-color-light-success-100);
+      --fill-color: var(--parsec-color-light-success-700);
+    }
 
-    &::part(native) {
-      padding: 0.625rem 0.75rem;
+    &:nth-of-type(2) .icon-container {
+      background: var(--parsec-color-light-danger-100);
+      --fill-color: var(--parsec-color-light-danger-700);
     }
 
-    &__icon {
-      color: var(--parsec-color-light-secondary-soft-text);
-      font-size: 1rem;
+    &:nth-of-type(3) .icon-container {
+      background: var(--parsec-color-light-secondary-disabled);
+      --fill-color: var(--parsec-color-light-secondary-hard-grey);
     }
   }
+}
 
-  .user-active {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    background: var(--parsec-color-light-secondary-background);
-    padding: 1.5rem 1rem 1rem;
-    border-radius: var(--parsec-radius-6);
-    gap: 1rem;
-    align-items: center;
+.users-active {
+  .users-list-item {
+    &:nth-of-type(1) .icon-container {
+      background: var(--parsec-color-tags-indigo-50);
+      color: var(--parsec-color-tags-indigo-700);
+    }
 
-    &-list {
-      display: flex;
-      gap: 0.25rem;
-      width: 100%;
+    &:nth-of-type(2) .icon-container {
+      background: var(--parsec-color-tags-blue-50);
+      color: var(--parsec-color-tags-blue-700);
+    }
 
-      &-item {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        gap: 0.25rem;
-      }
+    &:nth-of-type(3) .icon-container {
+      background: var(--parsec-color-tags-orange-50);
+      color: var(--parsec-color-tags-orange-700);
     }
+  }
+}
 
-    &__button {
-      color: var(--parsec-color-light-secondary-soft-text);
-      --background: var(--parsec-color-light-secondary-white);
-      --background-hover: var(--parsec-color-light-secondary-background);
-      border: 1px solid var(--parsec-color-light-secondary-medium);
-      box-shadow: var(--parsec-shadow-input);
-      border-radius: var(--parsec-radius-8);
-      width: 100%;
+.users-mfa {
+  .users-list-item {
+    &:nth-of-type(1) .icon-container {
+      background: var(--parsec-color-light-success-100);
+      color: var(--parsec-color-light-success-700);
+    }
 
-      &::part(native) {
-        padding: 0.625rem 1rem;
-      }
+    &:nth-of-type(2) .icon-container {
+      background: var(--parsec-color-light-danger-100);
+      --fill-color: var(--parsec-color-light-danger-700);
     }
   }
 }
diff --git a/client/src/components/users/types.ts b/client/src/components/users/types.ts
index 5b2e8329dbc..4167a48b690 100644
--- a/client/src/components/users/types.ts
+++ b/client/src/components/users/types.ts
@@ -16,6 +16,15 @@ export enum InvitationAction {
   Invite = 'invite',
 }
 
+export enum UserFilterType {
+  Active = 'active',
+  Revoked = 'revoked',
+  Frozen = 'frozen',
+  Admins = 'admins',
+  Standards = 'standards',
+  Outsiders = 'outsiders',
+}
+
 export interface UserModel extends UserInfo {
   isSelected: boolean;
   isCurrent: boolean;
diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index 4bd83ce1939..1268dc5fc05 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -1193,12 +1193,31 @@
             "revokedUsers": "Revoked | Revoked",
             "activeUsers": "Active | Active",
             "frozenUsers": "Frozen | Frozen",
-            "title": "Users",
+            "adminUsers": "Administrator | Administrators",
+            "memberUsers": "Member | Members",
+            "externalUsers": "External | Externals",
+            "mfaActive": "Active | Active",
+            "mfaInactive": "Inactive | Inactive",
+            "title": "User overview",
+            "subtitle": "Click on a category to see details",
+            "listTitle": "User status",
+            "profileTitle": "User profiles",
+            "mfaTitle": "Multi-factor authentication",
             "seeUsers": "See all users",
             "addUser": "Add a user",
             "invitations": {
                 "emailInvitations": "Email invitations",
                 "linkRequests": "Join Requests"
+            },
+            "modal": {
+                "titleActive": "Active users",
+                "titleRevoked": "Revoked users",
+                "titleFrozen": "Frozen users",
+                "titleAdmins": "Administrator users",
+                "titleStandards": "Standard users",
+                "titleOutsiders": "External users",
+                "loading": "Loading users...",
+                "noUsers": "No users found in this category"
             }
         },
         "size": {
@@ -1215,6 +1234,7 @@
             "allowed": "Enabled",
             "forbidden": "Disabled",
             "title": "Configuration",
+            "mfaRequired": "Multi-factor authentication requirement",
             "serverAddr": "Server address",
             "copyPath": "Copied",
             "copyFailed": "Failed to copy the organization address. Your browser or device does not seem to support copy/paste."
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index 458abde4ae1..65b60c2b3e0 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -1195,12 +1195,31 @@
             "revokedUsers": "Révoqué | Révoqués",
             "activeUsers": "Actif | Actifs",
             "frozenUsers": "Suspendu | Suspendus",
-            "title": "Utilisateurs",
+            "adminUsers": "Administrateur | Administrateurs",
+            "memberUsers": "Membre | Membres",
+            "externalUsers": "Externe | Externes",
+            "mfaActive": "Actif | Actifs",
+            "mfaInactive": "Inactif | Inactifs",
+            "title": "Vue d'ensemble des utilisateurs",
+            "subtitle": "Cliquez sur une catégorie pour voir les détails",
+            "listTitle": "État des utilisateurs",
+            "profileTitle": "Profils des utilisateurs",
+            "mfaTitle": "Double authentification",
             "seeUsers": "Voir tous les utilisateurs",
             "addUser": "Ajouter un utilisateur",
             "invitations": {
                 "emailInvitations": "Invitations par e-mail",
                 "linkRequests": "Demandes par lien"
+            },
+            "modal": {
+                "titleActive": "Utilisateurs actifs",
+                "titleRevoked": "Utilisateurs révoqués",
+                "titleFrozen": "Utilisateurs suspendus",
+                "titleAdmins": "Utilisateurs administrateurs",
+                "titleStandards": "Utilisateurs standards",
+                "titleOutsiders": "Utilisateurs externes",
+                "loading": "Chargement des utilisateurs...",
+                "noUsers": "Aucun utilisateur trouvé dans cette catégorie"
             }
         },
         "size": {
@@ -1217,6 +1236,7 @@
             "allowed": "Activé",
             "forbidden": "Désactivé",
             "title": "Configuration",
+            "mfaRequired": "Authentification multi-facteurs requise",
             "serverAddr": "Adresse du serveur",
             "copyPath": "Copié",
             "copyFailed": "Impossible de copier l'adresse de l'organisation. Il est possible que votre navigateur ou votre appareil n'autorise pas le copier/coller."
diff --git a/client/src/router/types.ts b/client/src/router/types.ts
index 29bb8dfbabe..fecf83275a3 100644
--- a/client/src/router/types.ts
+++ b/client/src/router/types.ts
@@ -346,6 +346,7 @@ export interface Query {
   readOnly?: boolean;
   webRedirectUrl?: string;
   workspaceMenu?: WorkspaceMenu;
+  userFilter?: string;
 }
 
 export interface ClientAreaQuery {
diff --git a/client/src/views/organizations/OrganizationInformationPage.vue b/client/src/views/organizations/OrganizationInformationPage.vue
index 0ef6c6363f9..6006f370f56 100644
--- a/client/src/views/organizations/OrganizationInformationPage.vue
+++ b/client/src/views/organizations/OrganizationInformationPage.vue
@@ -223,10 +223,8 @@ onUnmounted(() => {
     display: flex;
     gap: 2rem;
     height: fit-content;
-
-    @include ms.responsive-breakpoint('xl') {
-      flex-wrap: wrap;
-    }
+    max-width: 80rem;
+    flex-wrap: wrap;
 
     @include ms.responsive-breakpoint('sm') {
       width: 100%;