diff --git a/README.md b/README.md
index c1fd499e0..e709e7614 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@ The goal of this project is to make the easiest, fastest and most painless way t
 - Administration panel
 - Supports MySQL, PostgreSQL and SQLite3
 - Social account login(GitHub, Google, QQ, Weibo)
+- Multi-language support(English, Chinese, etc.)
 
 ## System Requirements
 
diff --git a/README_ZH.md b/README_ZH.md
index 24836208d..cdf858e77 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -32,6 +32,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 管理员面板
 - 支持 MySQL、PostgreSQL 以及 SQLite3 数据库
 - 社交帐号登录（GitHub、Google、QQ、微博）
+- 多语言支持（英文、简体中文等等）
 
 ## 系统要求
 
diff --git a/cmd/web.go b/cmd/web.go
index 764e2c1b9..1ce671be4 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -167,7 +167,6 @@ func runWeb(*cli.Context) {
 		r.Get("/ssh", user.SettingsSSHKeys)
 		r.Post("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost)
 		r.Get("/social", user.SettingsSocial)
-		r.Get("/orgs", user.SettingsOrgs)
 		r.Route("/delete", "GET,POST", user.SettingsDelete)
 	}, reqSignIn)
 	m.Group("/user", func(r *macaron.Router) {
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 25384b03f..e7ceb663d 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -155,8 +155,6 @@ social_desc = This is a list of associated social accounts. Remove any binding t
 unbind = Unbind
 unbind_success = Social account has been unbound.
 
-manage_orgs = Manage Organizations
-
 delete_account = Delete Your Account
 delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
 confirm_delete_account = Confirm Deletion
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 1b3329e6f..0fa0ef4e4 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -155,8 +155,6 @@ social_desc = 以下是与您帐户所关联的社交帐号，如果您发现有
 unbind = 解除绑定
 unbind_success = 社交帐号解除绑定成功！
 
-manage_orgs = 管理我的组织
-
 delete_account = 删除当前帐户
 delete_prompt = 删除操作会永久清除您的帐户信息，并且 <strong>不可恢复</strong>！
 confirm_delete_account = 确认删除帐户
diff --git a/routers/user/setting.go b/routers/user/setting.go
index d3b792134..4e0e468f0 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -21,7 +21,6 @@ const (
 	SETTINGS_PASSWORD base.TplName = "user/settings/password"
 	SETTINGS_SSH_KEYS base.TplName = "user/settings/sshkeys"
 	SETTINGS_SOCIAL   base.TplName = "user/settings/social"
-	SETTINGS_ORGS     base.TplName = "user/settings/orgs"
 	SETTINGS_DELETE   base.TplName = "user/settings/delete"
 	NOTIFICATION      base.TplName = "user/notification"
 	SECURITY          base.TplName = "user/security"
@@ -231,13 +230,6 @@ func SettingsSocial(ctx *middleware.Context) {
 	ctx.HTML(200, SETTINGS_SOCIAL)
 }
 
-func SettingsOrgs(ctx *middleware.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings")
-	ctx.Data["PageIsUserSettings"] = true
-	ctx.Data["PageIsSettingsOrgs"] = true
-	ctx.HTML(200, SETTINGS_ORGS)
-}
-
 func SettingsDelete(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsUserSettings"] = true
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl
index 45465178b..7c983d768 100644
--- a/templates/repo/migrate.tmpl
+++ b/templates/repo/migrate.tmpl
@@ -20,7 +20,7 @@
                     </div>
                     <div class="field">
                         <label for="auth_password">{{.i18n.Tr "password"}}</label>
-                        <input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_password" name="auth_password" type="text" value="{{.auth_password}}"  />
+                        <input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_password" name="auth_password" type="password" value="{{.auth_password}}"  />
                     </div>
                 </div>
             </div>
diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl
index cae120527..d6d20dee9 100644
--- a/templates/user/settings/nav.tmpl
+++ b/templates/user/settings/nav.tmpl
@@ -6,7 +6,6 @@
             <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
             <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
             <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
-            <li {{if .PageIsSettingsOrgs}}class="current"{{end}}><a href="/user/settings/orgs">{{.i18n.Tr "settings.orgs"}}</a></li>
             <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
         </ul>
     </div>
diff --git a/templates/user/settings/orgs.tmpl b/templates/user/settings/orgs.tmpl
deleted file mode 100644
index fb9096c3d..000000000
--- a/templates/user/settings/orgs.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="user-profile-setting" class="container clear">
-        {{template "user/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-profile-setting-content" class="panel panel-radius">
-                        <p class="panel-header"><strong>{{.i18n.Tr "settings.manage_orgs"}}</strong></p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{template "ng/base/footer" .}}
\ No newline at end of file