diff --git a/objects/userCreate.json.php b/objects/userCreate.json.php
index fa9efc85d..659d95143 100644
--- a/objects/userCreate.json.php
+++ b/objects/userCreate.json.php
@@ -1,97 +1,97 @@
 <?php
 
 header('Access-Control-Allow-Origin: *');
 header('Access-Control-Allow-Headers: Content-Type');
 header('Content-Type: application/json');
 
 global $global, $config;
 
 if (!isset($global['systemRootPath'])) {
     require_once '../videos/configuration.php';
 }
 if (!empty($_GET['PHPSESSID'])) {
     session_write_close();
     session_id($_GET['PHPSESSID']);
     _error_log("userCreate.json: session_id changed to ". $_GET['PHPSESSID']);
     session_start();
 }
 
 require_once $global['systemRootPath'] . 'objects/user.php';
 
 // Getting the mobile submitted value
 $inputJSON = url_get_contents('php://input');
 $input = _json_decode($inputJSON, true); //convert JSON into array
 if (!empty($input)) {
     foreach ($input as $key => $value) {
         $_POST[$key] = $value;
     }
 }
 $obj = new stdClass();
 if (empty($ignoreCaptcha)) {
     if (empty($_POST['captcha'])) {
         $obj->error = __("The captcha is empty");
         die(json_encode($obj));
     }
     require_once $global['systemRootPath'] . 'objects/captcha.php';
     $valid = Captcha::validation($_POST['captcha']);
     if (!$valid) {
         $obj->error = __("The captcha is wrong");
         die(json_encode($obj));
     }
 }
 // check if user already exists
 $userCheck = new User(0, $_POST['user'], false);
 
 if (!empty($userCheck->getBdId())) {
     $obj->error = __("User already exists");
     die(json_encode($obj));
 }
 
 if (!empty($advancedCustomUser->forceLoginToBeTheEmail)) {
     $_POST['email'] = $_POST['user'];
 }
 $_POST['email'] = trim(@$_POST['email']);
 if (!empty($advancedCustomUser->emailMustBeUnique)) {
     if (empty($_POST['email']) || !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
-        $obj->error = __("You must specify a valid email")." {$_POST['email']}";
+        $obj->error = __("You must specify a valid email")." {$_POST['email']} (create)";
         die(json_encode($obj));
     }
     $userFromEmail = User::getUserFromEmail($_POST['email']);
     if (!empty($userFromEmail)) {
         $obj->error = __("Email already exists");
         die(json_encode($obj));
     }
 }
 
 if (empty($_POST['user']) || empty($_POST['pass']) || empty($_POST['email']) || empty($_POST['name'])) {
     $obj->error = __("You must fill all fields");
     die(json_encode($obj));
 }
 
 if (!empty($_POST['email']) && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
     $obj->error = __("Invalid Email");
     die(json_encode($obj));
 }
 
 $user = new User(0);
 $user->setUser($_POST['user']);
 $user->setPassword($_POST['pass']);
 $user->setEmail($_POST['email']);
 $user->setName($_POST['name']);
 
 $user->setCanUpload($config->getAuthCanUploadVideos());
 
 $users_id = $user->save();
 
 if (!empty($users_id)) {
     $cu = AVideoPlugin::loadPluginIfEnabled('CustomizeUser');
     if (!empty($cu)) {
         CustomizeUser::setCanShareVideosFromUser($users_id, true);
     }
     if (!empty($advancedCustomUser->userDefaultUserGroup->value)) { // for new users use the default usergroup
         UserGroups::updateUserGroups($users_id, array($advancedCustomUser->userDefaultUserGroup->value), true);
     }
     AVideoPlugin::onUserSignup($users_id);
 }
 
 echo '{"status":"' . $users_id . '"}';
diff --git a/objects/userUpdate.json.php b/objects/userUpdate.json.php
index 1349bd4b4..cbbe44c1a 100644
--- a/objects/userUpdate.json.php
+++ b/objects/userUpdate.json.php
@@ -1,53 +1,53 @@
 <?php
 
 header('Content-Type: application/json');
 global $global, $config;
 if (!isset($global['systemRootPath'])) {
     require_once '../videos/configuration.php';
 }
 
 $obj = new stdClass();
 
 if (!User::isLogged()) {
     $obj->error = __("Is not logged");
     die(json_encode($obj));
 }
 $_REQUEST["do_not_login"]=1;
 require_once $global['systemRootPath'] . 'objects/user.php';
 $user = new User(0);
 $user->loadSelfUser();
 $user->setUser($_POST['user']);
 $user->setPassword($_POST['pass']);
 $user->setEmail($_POST['email']);
 $user->setName($_POST['name']);
 $user->setAbout($_POST['about']);
 $user->setAnalyticsCode($_POST['analyticsCode']);
 $user->setDonationLink($_POST['donationLink']);
 $unique = $user->setChannelName($_POST['channelName']);
 if (!$unique) {
     $obj->error = __("Channel name already exists");
     die(json_encode($obj));
 }
 
 if(empty($user->getBdId())){
     $obj->error = __("User not found");
     die(json_encode($obj));
 }
 
 if (!empty($advancedCustomUser->emailMustBeUnique)) {
     if (empty($_POST['email']) || !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
-        $obj->error = __("You must specify a valid email")." {$_POST['email']}";
+        $obj->error = __("You must specify a valid email")." {$_POST['email']} (update)";
         die(json_encode($obj));
     }
     $userFromEmail = User::getUserFromEmail($_POST['email']);
     if (!empty($userFromEmail) && $userFromEmail['id'] !== $user->getBdId()) {
         $obj->error = __("Email already exists");
         die(json_encode($obj));
     }
 }
 
 if (User::isAdmin() && !empty($_POST['status'])) {
     $user->setStatus($_POST['status']);
 }
 echo '{"status":"' . $user->save() . '"}';
 User::updateSessionInfo();