diff --git a/mailServer/static/mailServer/mailServer.js b/mailServer/static/mailServer/mailServer.js
index f50b36a45..3bf1db1c3 100755
--- a/mailServer/static/mailServer/mailServer.js
+++ b/mailServer/static/mailServer/mailServer.js
@@ -110,7 +110,7 @@ app.controller('createEmailAccount', function ($scope, $http) {
 
     $scope.generatePassword = function () {
         $scope.generatedPasswordView = false;
-        $scope.emailPassword = randomPassword(12);
+        $scope.emailPassword = randomPassword(16);
     };
 
     $scope.usePassword = function () {
@@ -465,7 +465,7 @@ app.controller('changeEmailPassword', function ($scope, $http) {
 
     $scope.generatePassword = function () {
         $scope.generatedPasswordView = false;
-        $scope.emailPassword = randomPassword(12);
+        $scope.emailPassword = randomPassword(16);
     };
 
     $scope.usePassword = function () {
@@ -1291,4 +1291,4 @@ app.controller('listEmails', function ($scope, $http) {
 });
 
 
-/* Java script code for List Emails Ends here */
\ No newline at end of file
+/* Java script code for List Emails Ends here */