diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index acf914c9d412..a64c4152330f 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -15,28 +15,27 @@
 						<span class="help">{{.i18n.Tr "org.org_name_helper"}}</span>
 					</div>
 
-					<div class="inline required field {{if .Err_OrgVisibility}}error{{end}}">
-						<label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label>
-						<div class="field">
-							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}/>
-								<label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
-							</div>
+					<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
+						<span class="inline required field"><label for="visibility">{{.i18n.Tr "org.settings.visibility"}}</label></span>
+						<div class="ui radio checkbox">
+							<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}/>
+							<label>{{.i18n.Tr "org.settings.visibility.public"}}</label>
 						</div>
-						<div class="field">
-							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}/>
-								<label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
-							</div>
+					</div>
+					<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
+						<label>&nbsp;</label>
+						<div class="ui radio checkbox">
+							<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}/>
+							<label>{{.i18n.Tr "org.settings.visibility.limited"}}</label>
 						</div>
-						<div class="field">
-							<div class="ui radio checkbox">
-								<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}/>
-								<label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
-							</div>
+					</div>
+					<div class="inline field {{if .Err_OrgVisibility}}error{{end}}">
+						<label>&nbsp;</label>
+						<div class="ui radio checkbox">
+							<input class="hidden enable-system-radio" tabindex="0" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}/>
+							<label>{{.i18n.Tr "org.settings.visibility.private"}}</label>
 						</div>
 					</div>
-
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button">