diff --git a/admin/themes/default/js/common.js b/admin/themes/default/js/common.js
index 1f0594100..0f80ff89a 100644
--- a/admin/themes/default/js/common.js
+++ b/admin/themes/default/js/common.js
@@ -49,6 +49,12 @@ if (!Array.prototype.indexOf)
   };
 }
 
+function getRandomInt(min, max) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min)) + min;
+}
+
 function sprintf() {
   var i = 0, a, f = arguments[i++], o = [], m, p, c, x, s = '';
   while (f) {
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 892b44085..47d272d59 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -55,6 +55,23 @@ jQuery(document).ready(function() {
     return false;
   });
 
+  jQuery("#genPass").click(function(e){
+    e.preventDefault();
+
+    var characterSet = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789';
+
+    var i;
+    var password;
+    var length = getRandomInt(8, 15);
+
+    password = '';
+    for (i = 0; i < length; i++) {
+      password += characterSet.charAt(Math.floor(Math.random() * characterSet.length));
+    }
+
+    jQuery('input[name=password]').val(password);
+  });
+
   jQuery("#addUserClose").click(function() {
     jQuery("#addUserForm").hide();
     return false;
@@ -885,6 +902,7 @@ span.infos, span.errors {background-image:none; padding:2px 5px; margin:0;border
     <p>
       <strong>{'Password'|translate}</strong><br>
       <input type="{if $Double_Password}password{else}text{/if}" name="password">
+      <a id="genPass" href="#" class="icon-lock">{'generate random password'|translate}</a>
     </p>
     
 {if $Double_Password}
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 282a289b1..0f7e633d8 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -427,4 +427,5 @@ $lang['Album name, Z &rarr; A'] = 'Album name, Z &rarr; A';
 $lang['Link: %s'] = 'Link: %s';
 $lang['Your authentication key is no longer valid.'] = 'Your authentication key is no longer valid.';
 $lang['Invalid username or password!'] = 'Invalid username or password!';
+$lang['generate random password'] = 'generate random password';
 ?>
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index bf890246e..2cac89fd9 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -427,3 +427,4 @@ $lang['Album name, Z &rarr; A'] = 'Nom de l\'album, Z &rarr; A';
 $lang['Link: %s'] = 'Lien: %s';
 $lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.';
 $lang['Invalid username or password!'] = 'Nom d\'utilisateur ou mot de passe invalide !';
+$lang['generate random password'] = 'générer un mot de passe aléatoire';
\ No newline at end of file