diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index fac513277..402b82130 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -1039,7 +1039,7 @@ function pwg_generate_reset_password_mail($username, $password_link, $gallery_ti
   return array(
     'subject' => '['.$gallery_title.'] '.l10n('Password Reset'),
     'content' => $message,
-    'email_format' => 'text/plain',
+    'content_format' => 'text/plain',
     );
 }
 
@@ -1078,7 +1078,7 @@ function pwg_generate_set_password_mail($username, $set_password_link, $gallery_
   return array(
     'subject' => l10n('Welcome to ') . '['.$gallery_title.']',
     'content' => $message,
-    'email_format' => 'text/plain',
+    'content_format' => 'text/plain',
     );
 }
 
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 245f3d470..17bf0c8b5 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1927,7 +1927,7 @@ function userprefs_get_param($param, $default_value=null)
  * @param int $user_id
  * @return bool true if first connexion else false 
  */
-function is_first_connection($user_id)
+function has_already_logged_in($user_id)
 {
   $query = '
 SELECT COUNT(*)
diff --git a/include/ws_functions/pwg.users.php b/include/ws_functions/pwg.users.php
index a78fef47e..7e65219db 100644
--- a/include/ws_functions/pwg.users.php
+++ b/include/ws_functions/pwg.users.php
@@ -1020,7 +1020,7 @@ function ws_users_generate_password_link($params, &$service)
     return new PwgError(403, 'You cannot perform this action');
   }
 
-  $first_login = is_first_connection($params['user_id']);
+  $first_login = has_already_logged_in($params['user_id']);
   $generate_link = generate_password_link($params['user_id'], $first_login);
   $send_by_mail_response = null;
 
diff --git a/password.php b/password.php
index 2b7410859..7ae7a00f7 100644
--- a/password.php
+++ b/password.php
@@ -231,7 +231,7 @@ if (isset($_GET['key']) and !isset($_POST['submit']))
     $userdata = getuserdata($user_id, false);
     $page['username'] = $userdata['username'];
     $template->assign('key', $_GET['key']);
-    $first_login = is_first_connection($user_id);
+    $first_login = has_already_logged_in($user_id);
 
     if (!isset($page['action']))
     {