diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index ae4c8a295..5d9c737a2 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -454,3 +454,4 @@ $lang['Custom dates'] = 'Custom dates';
 $lang['There are no tags available for the photos currently filtered'] = 'There are no tags available for the photos currently filtered';
 $lang['There are no creation dates available for the photos currently filtered'] = 'There are no creation dates available for the photos currently filtered';
 $lang['There are no authors available for the photos currently filtered'] = 'There are no authors available for the photos currently filtered';
+$lang['Set your password below.'] = 'Set your password below.';
diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php
index 9b1f11123..6fef01b41 100644
--- a/language/fr_FR/common.lang.php
+++ b/language/fr_FR/common.lang.php
@@ -454,3 +454,4 @@ $lang['Custom dates'] = 'Dates personnalisées';
 $lang['There are no tags available for the photos currently filtered'] = 'Aucun tag n\'est disponible pour les photos actuellement filtrées';
 $lang['There are no creation dates available for the photos currently filtered'] = 'Aucune date de création n\'est disponible pour les photos actuellement filtrées';
 $lang['There are no authors available for the photos currently filtered'] = 'Aucun auteur n\'est disponible pour les photos actuellement filtrées';
+$lang['Set your password below.'] = 'Définissez votre mot de passe ci-dessous.';
diff --git a/password.php b/password.php
index 8f3fc4eef..209c0c019 100644
--- a/password.php
+++ b/password.php
@@ -286,6 +286,7 @@ if ('lost' == $page['action'])
 else if ('reset' == $page['action'] and isset($first_login) and $first_login) 
 {
   $title = l10n('Welcome');
+  $template->assign('is_first_login', true);
 }
 
 $page['body_id'] = 'thePasswordPage';
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index f469d0774..e9389ff9d 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -12,7 +12,7 @@
 {if $action ne 'none'}
 <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
 <fieldset>
-	<legend>{'Forgot your password?'|translate}</legend>
+  {if !isset($is_first_login)}<legend>{'Forgot your password?'|translate}</legend>{/if}
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   {if $action eq 'lost'}
@@ -29,11 +29,13 @@
   <p class="bottomButtons"><input type="submit" name="submit" value="{'Change my password'|@translate}"></p>
   {elseif $action eq 'reset'}
 
-  <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div>
+  <div class="message">
+  {'Hello'|@translate} <em>{$username}</em>. {if !isset($is_first_login)}{'Enter your new password below.'|@translate}{else}{'Set your password below.'|translate}{/if}
+  </div>
 
   <p>
     <label>
-      {'New password'|@translate}
+        {if !isset($is_first_login)}{'New password'|@translate}{else}{'Password'|translate}{/if}
       <br>
       <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
     </label>