diff --git a/func/main.sh b/func/main.sh
index 69737c72..9346e918 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -152,7 +152,7 @@ generate_password() {
         matrix=0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
     fi
     if [ -z "$lenght" ]; then
-        lenght=10
+        lenght=16
     fi
     i=1
     while [ $i -le $lenght ]; do
diff --git a/web/js/pages/add_user.js b/web/js/pages/add_user.js
index 510ed167..597c869e 100644
--- a/web/js/pages/add_user.js
+++ b/web/js/pages/add_user.js
@@ -7,7 +7,7 @@ $(function() {
 
 randomString = function() {
     var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
-    var string_length = 10;
+    var string_length = 16;
     var randomstring = '';
     for (var i = 0; i < string_length; i++) {
         var rnum = Math.floor(Math.random() * chars.length);
diff --git a/web/js/pages/edit_user.js b/web/js/pages/edit_user.js
index 439aeab0..381f4330 100644
--- a/web/js/pages/edit_user.js
+++ b/web/js/pages/edit_user.js
@@ -1,6 +1,6 @@
 function randomString() {
     var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
-    var string_length = 10;
+    var string_length = 16;
     var randomstring = '';
     for (var i = 0; i < string_length; i++) {
         var rnum = Math.floor(Math.random() * chars.length);