diff --git a/admin/themes/default/template/install.tpl b/admin/themes/default/template/install.tpl
index ef9a7720a..3426c1c1a 100644
--- a/admin/themes/default/template/install.tpl
+++ b/admin/themes/default/template/install.tpl
@@ -282,7 +282,7 @@ jQuery().ready(function(){ldelim}
         </label>
         <br>
         <label>
-          <input type="checkbox" name="send_password_by_mail" checked="checked">
+          <input type="checkbox" name="send_credentials_by_mail" checked="checked">
           {'Send my connection settings by email'|@translate}
         </label>
       </td>
diff --git a/install.php b/install.php
index bea9d726f..81724697d 100644
--- a/install.php
+++ b/install.php
@@ -498,7 +498,7 @@ else
     log_user($user['id'], false);
     
     // email notification
-    if (isset($_POST['send_password_by_mail']))
+    if (isset($_POST['send_credentials_by_mail']))
     {
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
             
@@ -510,7 +510,7 @@ else
         get_l10n_args('', ''),
         get_l10n_args('Link: %s', get_absolute_root_url()),
         get_l10n_args('Username: %s', $admin_name),
-        get_l10n_args('Password: %s', $admin_pass1),
+        get_l10n_args('Password: ********** (no copy by email)', ''),
         get_l10n_args('Email: %s', $admin_mail),
         get_l10n_args('', ''),
         get_l10n_args('Don\'t hesitate to consult our forums for any help: %s', PHPWG_URL),
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index c07b04d6f..a6a4a0657 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -252,6 +252,7 @@ $lang['Password Reset'] = 'Password Reset';
 $lang['password updated'] = "password updated";
 $lang['Password'] = "Password";
 $lang['Password: %s'] = 'Password: %s';
+$lang['Password: ********** (no copy by email)'] = 'Password: ********** (no copy by email)';
 $lang['Pause of slideshow'] = "Pause slideshow";
 $lang['Permalink for album not found'] = 'Permalink for album not found';
 $lang['Photo sizes'] = 'Photo sizes';