diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
index 0d99f0eb3624..38b90f364a2a 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java
@@ -122,8 +122,6 @@ public class GithubCreateGistAction extends DumbAwareAction {
       @Override
       public void run() {
         final HttpClient client = anonymous ? GithubUtil.getHttpClient(null, null) : GithubUtil.getHttpClient(settings.getLogin(), password);
-        client.getParams().setContentCharset("UTF-8");
-    
         final PostMethod method = new PostMethod("https://gist.github.com/gists");
         method.addParameters(new NameValuePair[]{
           new NameValuePair("description", description),
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
index f727a5fb09f3..75dd885452ed 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
@@ -116,7 +116,6 @@ public class GithubUtil {
 
   public static HttpMethod doREST(final String url, final String login, final String password, final String request, final boolean post) throws Exception {
     final HttpClient client = getHttpClient(login, password);
-    client.getParams().setContentCharset("UTF-8");
     final String uri = "https://" + getHostByUrl(url) + API_URL + request;
     final HttpMethod method = post ? new PostMethod(uri) : new GetMethod(uri);
     client.executeMethod(method);
@@ -125,6 +124,7 @@ public class GithubUtil {
 
   public static HttpClient getHttpClient(@Nullable final String login, @Nullable final String password) {
     final HttpClient client = new HttpClient();
+    client.getParams().setContentCharset("UTF-8");
     // Configure proxySettings if it is required
     final HttpConfigurable proxySettings = HttpConfigurable.getInstance();
     if (proxySettings.USE_HTTP_PROXY){
@@ -135,6 +135,7 @@ public class GithubUtil {
       }
     }
     if (login != null && password != null) {
+      client.getParams().setCredentialCharset("UTF-8");
       client.getParams().setAuthenticationPreemptive(true);
       client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(login, password));
     }