diff --git a/src/components/UserMasterPanel.js b/src/components/UserMasterPanel.js
index eda630a..8d138e7 100644
--- a/src/components/UserMasterPanel.js
+++ b/src/components/UserMasterPanel.js
@@ -124,7 +124,7 @@ const UserMasterPanel = (props) => {
 
   const generatePassword = () => {
     const passwordGeneratorOptions = modulesManager.getConf("fe-admin", "passwordGeneratorOptions", {
-      length: 10,
+      length: 12,
       isNumberRequired: true,
       isLowerCaseRequired: true,
       isUpperCaseRequired: true,
diff --git a/src/helpers/passwordGenerator.js b/src/helpers/passwordGenerator.js
index ea67e19..4f3698c 100644
--- a/src/helpers/passwordGenerator.js
+++ b/src/helpers/passwordGenerator.js
@@ -6,7 +6,7 @@ export const passwordGenerator = (options) => {
   const lowercase = uppercase.toLowerCase();
   const numbers = "0123456789";
   const specialCharacters = "!@#$%^&*()_+-=[]{}|;:,.<>?";
-  const length = options?.length ?? 10;
+  const length = options?.length ?? 12;
   const isNumberRequired = options?.isNumberRequired ?? true;
   const isLowerCaseRequired = options?.isLowerCaseRequired ?? true;
   const isUpperCaseRequired = options?.isUpperCaseRequired ?? true;
@@ -25,20 +25,31 @@ export const passwordGenerator = (options) => {
 
   const categoriesArray = getCategoriesArray();
 
-  getSafeRandomNumberArray(length, categoriesArray.length).forEach((category) => {
-    password += getRandomOfType(categoriesArray[category]);
+  categoriesArray.forEach((category) => {
+    password += getRandomOfType(category);
   });
 
+  for (let i = categoriesArray.length; i < length; i++) {
+    const randomCategory = categoriesArray[getSafeRandomNumberArray(1, categoriesArray.length)];
+    password += getRandomOfType(randomCategory);
+  }
+
+  password = shuffle(password);
+
   return password;
 };
 
+function shuffle(str) {
+  return str.split('').sort(() => getSafeRandomNumberArray(1, 3) - 0.5).join('');
+}
+
+function getRandomOfType(charset) {
+  return charset.charAt(getSafeRandomNumberArray(1, charset.length));
+}
+
 function getSafeRandomNumberArray(length, modulo) {
   // crypto.getRandomValues is coded in a way that is cryptographically secure
   // do not use Math.Random to generate password
   const seedArray = self.crypto.getRandomValues(new Uint32Array(length));
   return Array.from(seedArray, (value) => value % modulo);
 }
-
-function getRandomOfType(charset) {
-  return charset.charAt(getSafeRandomNumberArray(1, charset.length));
-}