diff --git a/Yavsc/Controllers/ManageController.cs b/Yavsc/Controllers/ManageController.cs
index 91270017..adf5dba6 100644
--- a/Yavsc/Controllers/ManageController.cs
+++ b/Yavsc/Controllers/ManageController.cs
@@ -25,6 +25,7 @@ namespace Yavsc.Controllers
     using Yavsc.Services;
     using Yavsc.ViewModels.Manage;
     using Yavsc.Models.Calendar;
+    using System.IO;
 
     [Authorize]
     public class ManageController : Controller
@@ -339,7 +340,7 @@ namespace Yavsc.Controllers
         public async Task<IActionResult> SetFullName()
         {
             var user = await _userManager.FindByIdAsync(User.GetUserId());
-            return View(user.FullName);
+            return View(user);
         }
         //
         // POST: /Manage/ChangePassword
@@ -367,20 +368,13 @@ namespace Yavsc.Controllers
             return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error });
         }
 
-        //
-        // GET: /Manage/ChangeUserName
         public IActionResult ChangeUserName()
         {
             return View(new ChangeUserNameViewModel() { NewUserName = User.Identity.Name });
         }
 
-        public IActionResult CHUN()
-        {
-            return View(new ChangeUserNameViewModel() { NewUserName = User.Identity.Name });
-        }
-
         [HttpPost]
-        public async Task<IActionResult> CHUN(ChangeUserNameViewModel model)
+        public async Task<IActionResult> ChangeUserName(ChangeUserNameViewModel model)
         {
             if (!ModelState.IsValid)
             {
@@ -395,17 +389,24 @@ namespace Yavsc.Controllers
 
                 if (result.Succeeded)
                 {
-                    /* Obsolete : files are no more prefixed using the user name.
-
+                    // Renames the blog files
                     var userdirinfo = new DirectoryInfo(
-                       Path.Combine(_siteSettings.UserFiles.DirName,
+                       Path.Combine(_siteSettings.UserFiles.Blog,
                         oldUserName));
-                    var newdir = Path.Combine(_siteSettings.UserFiles.DirName,
+                    var newdir = Path.Combine(_siteSettings.UserFiles.Blog,
                        model.NewUserName);
                     if (userdirinfo.Exists)
                         userdirinfo.MoveTo(newdir);
-                    */
-
+                    // Renames the Avatars
+                    foreach (string s in new string [] { ".png", ".s.png", ".xs.png" })
+                    {
+                        FileInfo fi = new FileInfo(
+                            Path.Combine(_siteSettings.UserFiles.Avatars,
+                            oldUserName+s));
+                        if (fi.Exists)
+                            fi.MoveTo(Path.Combine(_siteSettings.UserFiles.Avatars,
+                            model.NewUserName+s));
+                    }
                     await _signInManager.SignInAsync(user, isPersistent: false);
                     _logger.LogInformation(3, "User changed his user name successfully.");
                     return RedirectToAction(nameof(Index), new { Message = ManageMessageId.ChangeNameSuccess });
diff --git a/Yavsc/Views/Manage/CHUN.cshtml b/Yavsc/Views/Manage/CHUN.cshtml
deleted file mode 100644
index 176bef7f..00000000
--- a/Yavsc/Views/Manage/CHUN.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-@model ChangeUserNameViewModel
-@{
-    ViewData["Title"] = "Change user name";
-}
-
-<h2>@ViewData["Title"].</h2>
-
-<form asp-controller="Manage" asp-action="CHUN" method="post" class="form-horizontal" role="form">
-    <h4>Change user name form</h4>
-    <hr />
-    <div asp-validation-summary="ValidationSummary.All" class="text-danger"></div>
-    <div class="form-group">
-        <label asp-for="NewUserName" class="col-md-2 control-label"></label>
-        <div class="col-md-10">
-            <input asp-for="NewUserName" class="form-control" />
-            <span asp-validation-for="NewUserName" class="text-danger"></span>
-        </div>
-    </div>
-</form>
-
-@section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-}
diff --git a/Yavsc/Views/Manage/ChangeUserName.cshtml b/Yavsc/Views/Manage/ChangeUserName.cshtml
old mode 100755
new mode 100644
index d86d2ab6..8799418e
--- a/Yavsc/Views/Manage/ChangeUserName.cshtml
+++ b/Yavsc/Views/Manage/ChangeUserName.cshtml
@@ -1,6 +1,6 @@
 @model ChangeUserNameViewModel
 @{
-    ViewData["Title"] = "Change user name";
+    ViewData["Title"] = @SR["Changer de nom d'utilisateur"];
 }
 
 <h2>@ViewData["Title"].</h2>