diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java
index f3f9ca3d0..bebd09fc6 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java
@@ -34,7 +34,6 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;
@@ -197,6 +196,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
             return;
         }
         set_profile_name.setText(account.getDisplay_name());
+        set_profile_name.setSelection(set_profile_name.getText().length());
 
         final String content;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
index 5bb7a470c..6e91bffad 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
@@ -134,18 +134,36 @@ public class API {
 
         HashMap<String, String> requestParams = new HashMap<>();
         if( display_name != null)
-            requestParams.put("display_name",display_name);
+            try {
+                requestParams.put("display_name",URLEncoder.encode(display_name, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                requestParams.put("display_name",display_name);
+            }
         if( note != null)
-            requestParams.put("note",note);
+            try {
+                requestParams.put("note",URLEncoder.encode(note, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                requestParams.put("note",note);
+            }
         if( avatar != null)
-            requestParams.put("avatar",avatar);
+            try {
+                requestParams.put("avatar",URLEncoder.encode(avatar, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                requestParams.put("avatar",avatar);
+            }
         if( header != null)
-            requestParams.put("header",header);
+            try {
+                requestParams.put("header",URLEncoder.encode(header, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                requestParams.put("header",header);
+            }
         try {
             new HttpsConnection().patch(getAbsoluteUrl("/accounts/update_credentials"), 60, requestParams, prefKeyOauthTokenT);
         } catch (HttpsConnection.HttpsConnectionException e) {
+            e.printStackTrace();
             setError(e.getStatusCode(), e);
         }catch (Exception e) {
+            e.printStackTrace();
             setDefaultError();
         }
         return apiResponse;