diff --git a/modules/auth/org.go b/modules/auth/org.go
index 3e6c55c18..0dfab951e 100644
--- a/modules/auth/org.go
+++ b/modules/auth/org.go
@@ -26,7 +26,7 @@ func (f *CreateOrgForm) Validate(ctx *macaron.Context, errs binding.Errors) bind
 }
 
 type UpdateOrgSettingForm struct {
-	OrgUserName string `form:"uname" binding:"Required;MaxSize(35)"`
+	OrgUserName string `form:"uname" binding:"Required;AlphaDashDot;MaxSize(30)" locale:"org.org_name_holder"`
 	OrgFullName string `form:"fullname" binding:"MaxSize(100)"`
 	Email       string `form:"email" binding:"Required;Email;MaxSize(50)"`
 	Description string `form:"desc" binding:"MaxSize(255)"`
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index cc7065e8f..169067a79 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -16,7 +16,7 @@
               {{.CsrfTokenHtml}}
               <input type="hidden" name="action" value="update">
               <div class="field">
-                <label class="req" for="orgname">{{.i18n.Tr "username"}}</label>
+                <label class="req" for="orgname">{{.i18n.Tr "org.org_name_holder"}}</label>
                 <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="orgname" name="uname" value="{{.Org.Name}}" data-orgname="{{.Org.Name}}" required />
               </div>
               <div class="white-popup-block mfp-hide" id="change-orgname-modal">