diff --git a/README.md b/README.md
index 7e903abd5d..a43be6f36f 100644
--- a/README.md
+++ b/README.md
@@ -52,10 +52,11 @@ More importantly, Gogs only needs one binary to setup your own project hosting o
 
 Make sure you install [Prerequirements](http://gogs.io/docs/installation/) first.
 
-There are 4 ways to install Gogs:
+There are 5 ways to install Gogs:
 
 - [Install from binary](http://gogs.io/docs/installation/install_from_binary.md): **STRONGLY RECOMMENDED**
 - [Install from source](http://gogs.io/docs/installation/install_from_source.md)
+- [Install from packages](http://gogs.io/docs/installation/install_from_packages.md)
 - [Ship with Docker](https://github.com/gogits/gogs/tree/master/dockerfiles)
 - [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
 
diff --git a/README_ZH.md b/README_ZH.md
index d1f742d44d..05797b9634 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -44,10 +44,11 @@ Gogs 完全使用 Go 语言来实现对 Git 数据的操作，实现 **零** 依
 
 在安装 Gogs 之前，您需要先安装 [基本环境](http://gogs.io/docs/installation/)。
 
-然后，您可以通过以下 4 种方式来安装 Gogs：
+然后，您可以通过以下 5 种方式来安装 Gogs：
 
 - [二进制安装](http://gogs.io/docs/installation/install_from_binary.md): **强烈推荐**
 - [源码安装](http://gogs.io/docs/installation/install_from_source.md)
+- [包管理安装](http://gogs.io/docs/installation/install_from_packages.md)
 - [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/dockerfiles)
 - [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
 
diff --git a/models/login.go b/models/login.go
index 313880df53..be185488ac 100644
--- a/models/login.go
+++ b/models/login.go
@@ -37,8 +37,11 @@ var LoginTypes = map[int]string{
 	LT_SMTP: "SMTP",
 }
 
-var _ core.Conversion = &LDAPConfig{}
-var _ core.Conversion = &SMTPConfig{}
+// Ensure structs implmented interface.
+var (
+	_ core.Conversion = &LDAPConfig{}
+	_ core.Conversion = &SMTPConfig{}
+)
 
 type LDAPConfig struct {
 	ldap.Ldapsource
diff --git a/modules/auth/authentication.go b/modules/auth/authentication.go
index 4456d2a5f7..170b24a988 100644
--- a/modules/auth/authentication.go
+++ b/modules/auth/authentication.go
@@ -27,6 +27,8 @@ type AuthenticationForm struct {
 	MsAdSA            string `form:"ms_ad_sa"`
 	IsActived         bool   `form:"is_actived"`
 	SmtpAuth          string `form:"smtpauth"`
+	SmtpHost          string `form:"smtphost"`
+	SmtpPort          int    `form:"smtpport"`
 	Tls               bool   `form:"tls"`
 	AllowAutoRegister bool   `form:"allowautoregister"`
 }
diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index 1822fd69ae..0bc2566a1c 100644
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -55,8 +55,8 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	case models.LT_SMTP:
 		u = &models.SMTPConfig{
 			Auth: form.SmtpAuth,
-			Host: form.Host,
-			Port: form.Port,
+			Host: form.SmtpHost,
+			Port: form.SmtpPort,
 			TLS:  form.Tls,
 		}
 	default:
@@ -132,8 +132,8 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	case models.LT_SMTP:
 		config = &models.SMTPConfig{
 			Auth: form.SmtpAuth,
-			Host: form.Host,
-			Port: form.Port,
+			Host: form.SmtpHost,
+			Port: form.SmtpPort,
 			TLS:  form.Tls,
 		}
 	default:
diff --git a/templates/admin/auths/edit.tmpl b/templates/admin/auths/edit.tmpl
index 2c7a5754bf..b3277242ce 100644
--- a/templates/admin/auths/edit.tmpl
+++ b/templates/admin/auths/edit.tmpl
@@ -18,11 +18,11 @@
                     <div class="form-group">
                         <label class="col-md-3 control-label">Auth Type: </label>
                         <input type="hidden" name="type" value="{{.Source.Type}}"/>
-                        <div class="col-md-7">
-                        {{range $key, $val := .LoginTypes}}
-                            {{if eq $key $type}}{{$val}}{{end}}
-                        {{end}}
-                        </div>
+                        <label class="control-label">
+                            {{range $key, $val := .LoginTypes}}
+                                {{if eq $key $type}}{{$val}}{{end}}
+                            {{end}}
+                        </label>
                     </div>
                     <div class="form-group {{if .Err_AuthName}}has-error has-feedback{{end}}">
                         <label class="col-md-3 control-label">Name: </label>
@@ -85,46 +85,47 @@
                         <label class="col-md-3 control-label">SMTP Auth: </label>
                         <div class="col-md-7">
                             <select name="smtpauth" class="form-control">
-                            {{$auth := .Source.SMTP.Auth}}
+                                {{$auth := .Source.SMTP.Auth}}
                                 {{range .SMTPAuths}}
                                 <option value="{{.}}"
                                 {{if eq . $auth}} selected{{end}}>{{.}}</option>
                                 {{end}}
-                                }
                             </select>
                         </div>
                     </div>
 
-                    <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                    <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
                         <label class="col-md-3 control-label">Host: </label>
                         <div class="col-md-7">
                             <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.Source.SMTP.Host}}">
                         </div>
                     </div>
 
-                    <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
+                    <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
                         <label class="col-md-3 control-label">Port: </label>
                         <div class="col-md-7">
                             <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.Source.SMTP.Port}}">
                         </div>
                     </div>
 
-                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
+                    <!-- <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
                         <label class="col-md-3 control-label">TLS: </label>
                         <div class="col-md-7">
-                            <input name="smtptls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
+                            <input name="tls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
                         </div>
-                    </div>
+                    </div> -->
                     {{end}}
-                    
-                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Auto Register: </label>
-                            <div class="col-md-7">
-                                <input name="allowautoregister" type="checkbox" class="form-control" {{if .Source.AllowAutoRegister}}checked{{end}}>
-                            </div>
-                    </div>
 
                     <div class="form-group">
+                        <div class="col-md-offset-3 col-md-7">
+                            <div class="checkbox">
+                                <label>
+                                    <input name="allowautoregister" type="checkbox" {{if .Source.AllowAutoRegister}}checked{{end}}>
+                                    <strong>Enable Auto Registeration</strong>
+                                </label>
+                            </div>
+                        </div>
+
                         <div class="col-md-7 col-md-offset-3">
                             <div class="checkbox">
                                 <label>
@@ -134,7 +135,9 @@
                             </div>
                         </div>
                     </div>
+
                     <hr/>
+
                     <div class="form-group">
                         <div class="col-md-offset-3 col-md-6">
                             <button type="submit" class="btn btn-lg btn-primary btn-block">Update authentication config</button>
diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auths/new.tmpl
index e5dcb4339b..3741d9cc5f 100644
--- a/templates/admin/auths/new.tmpl
+++ b/templates/admin/auths/new.tmpl
@@ -93,17 +93,17 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                        <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
                             <label class="col-md-3 control-label">Host: </label>
                             <div class="col-md-7">
-                                <input name="host" class="form-control" placeholder="Type host address" value="{{.host}}">
+                                <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.smtphost}}">
                             </div>
                         </div>
 
-                        <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
+                        <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
                             <label class="col-md-3 control-label">Port: </label>
                             <div class="col-md-7">
-                                <input name="port" class="form-control" placeholder="Type port number" value="{{.port}}">
+                                <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.smtpport}}">
                             </div>
                         </div>