diff --git a/custompages/first_login.php b/custompages/first_login.php
new file mode 100644
index 0000000000..eb6b9150dc
--- /dev/null
+++ b/custompages/first_login.php
@@ -0,0 +1,91 @@
+<?php
+require_once('language.php');
+require_once(dirname(__FILE__).'/../main/inc/global.inc.php');
+require_once (api_get_path(LIBRARY_PATH).'conditionallogin.lib.php');
+require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
+
+if (! isset($_SESSION['conditional_login']['uid']))
+  die("Not Authorised");
+
+if (isset($_POST['password'])){
+  $u = UserManager::get_user_info_by_id($_SESSION['conditional_login']['uid']);
+  if ($_POST['password'] != $_POST['password2']) { 
+    header('Location: '. api_get_self().'?invalid=2');
+    exit();
+  }
+  if (empty($_POST['password'])){ //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
+    header('Location: '. api_get_self().'?invalid=1');
+    exit();
+  }
+  $password = $_POST['password'];
+  $updated = UserManager::update_user($u['user_id'], $u['firstname'], $u['lastname'], $u['username'], $password, $u['auth_source'], $u['email'], $u['status'], $u['official_code'], $u['phone'], $u['picture_uri'], $u['expiration_date'], $u['active'], $u['creator_id'], $u['hr_dept_id'], $u['extra'], $u['language'],'');
+
+  if ($updated) {
+    UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
+    ConditionalLogin::login();
+  }
+}
+if ($_GET['invalid'] == 1) {
+  $error_message = get_lang('CurrentPasswordEmptyOrIncorrect');
+}
+if ($_GET['invalid'] == 2) {
+  $error_message = get_lang('PassTwo');
+}
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+	<title>Custompage - login</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<!--[if !IE 6]><!-->
+	<link rel="stylesheet" type="text/css" href="/custompages/style.css" />
+	<!--<![endif]-->
+	<!--[if IE 6]>
+	<link rel="stylesheet" type="text/css" href="/custompages/style-ie6.css" />
+	<![endif]-->
+
+	<script type="text/javascript" src="/custompages/jquery-1.5.1.min.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			if (top.location != location) 
+				top.location.href = document.location.href ;
+
+			// Handler pour la touche retour
+			$('input').keyup(function(e) { 
+				if (e.keyCode == 13) {
+					$('#changepassword-form').submit();
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+	<div id="backgroundimage">
+		<img src="/custompages/images/page-background.png" class="backgroundimage" />
+	</div>
+	<div id="wrapper">
+		<div id="header">
+			<img src="/custompages/images/header.png" alt="Logo" />
+		</div> <!-- #header -->
+		<div id="changepassword-form-box" class="form-box">
+		<?php if (isset($error_message)) {
+			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
+		}?> 
+			<form id="changepassword-form" class="form" method="post">
+				<div>
+          <label for="password">*<?php echo cblue_get_lang('langPass');?></label>
+					<input name="password" type="password" /><br />
+          <label for="password2">*<?php echo cblue_get_lang('langPass');?></label>
+					<input name="password2" type="password" /><br />
+				</div>
+			</form>
+			<div id="changepassword-form-submit" class="form-submit" onclick="document.forms['changepassword-form'].submit();">
+      <span><?php echo cblue_get_lang('LoginEnter');?></span>
+			</div> <!-- #form-submit -->
+		</div> <!-- #form -->
+		<div id="footer">
+			<img src="/custompages/images/footer.png" />
+		</div> <!-- #footer -->
+	</div> <!-- #wrapper -->
+</body>
+</html>
diff --git a/main/auth/conditional_login/first_login.php b/main/auth/conditional_login/first_login.php
deleted file mode 100644
index f4ab71fd75..0000000000
--- a/main/auth/conditional_login/first_login.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-require_once(dirname(__FILE__).'/../../inc/global.inc.php');
-require_once (api_get_path(LIBRARY_PATH).'conditionallogin.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
-//Don't forget to change the url with the name of your file
-$url =  api_get_path(WEB_PATH).'main/auth/conditional_login/first_login.php';
-
-if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-  </head>
-  <body>
-  <h1> First login </h1>
-  <p> This is your first login please complete those fields : </p>
-  <form id="data_completion" name="data_completion" method="post" action="<?php echo $url?>">
-        Téléphone : <input type="text" name="phone_number" />
-        <input type="submit" name="submit" value="Submit" />
-    </form>
-  </body>
-</html>
-<?php
-if (isset($_POST['submit'])){
-  $u = UserManager::get_user_info_by_id($_SESSION['conditional_login']['uid']);
-  $u['phone'] = $_POST['phone_number'];
-  $password = null; // we don't want to change the password 
-  $updated = UserManager::update_user($u['user_id'], $u['firstname'], $u['lastname'], $u['username'], $password, $u['auth_source'], $u['email'], $u['status'], $u['official_code'], $u['phone'], $u['picture_uri'], $u['expiration_date'], $u['active'], $u['creator_id'], $u['hr_dept_id'], $u['extra'], $u['language'],'');
-
-  if ($updated) {
-    UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
-    ConditionalLogin::login();
-  }
-}
-?>
