diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index d23e0f2420b05..0870eb5221664 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1081,7 +1081,7 @@ commits.signed_by_untrusted_user = Signed by untrusted user
 commits.signed_by_untrusted_user_unmatched = Signed by untrusted user who does not match committer
 commits.gpg_key_id = GPG Key ID
 
-ext_issues = Ext. Issues
+ext_issues = Access to External Issues
 ext_issues.desc = Link to an external issue tracker.
 
 projects = Projects
@@ -1559,7 +1559,7 @@ signing.wont_sign.commitssigned = The merge will not be signed as all the associ
 signing.wont_sign.approved = The merge will not be signed as the PR is not approved
 signing.wont_sign.not_signed_in = You are not signed in
 
-ext_wiki = Ext. Wiki
+ext_wiki = Access to External Wiki
 ext_wiki.desc = Link to an external wiki.
 
 wiki = Wiki
@@ -2238,9 +2238,9 @@ teams.none_access = No Access
 teams.none_access_helper = Members cannot view or do any other action on this unit.
 teams.general_access = General Access
 teams.general_access_helper = Members permissions will be decided by below permission table.
-teams.read_access = Read Access
+teams.read_access = Read
 teams.read_access_helper = Members can view and clone team repositories.
-teams.write_access = Write Access
+teams.write_access = Write
 teams.write_access_helper = Members can read and push to team repositories.
 teams.admin_access = Administrator Access
 teams.admin_access_helper = Members can pull and push to team repositories and add collaborators to them.
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 4562db988b42d..1d231c0100044 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -89,40 +89,55 @@
 									</thead>
 									<tbody>
 										{{range $t, $unit := $.Units}}
-											<tr>
-												<td>
-													{{if $unit.Type.UnitGlobalDisabled}}
-													<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
-													{{else}}
-													<div class="field">
-													{{end}}
-														<div class="ui">
-															<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
-															<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
+											{{if ge $unit.MaxPerms 2}}
+												<tr>
+													<td>
+														{{if $unit.Type.UnitGlobalDisabled}}
+														<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
+														{{else}}
+														<div class="field">
+														{{end}}
+															<div class="ui">
+																<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
+																<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
+															</div>
 														</div>
-													</div>
-												</td>
-												<td class="center aligned">
-													<div class="ui radio checkbox">
-														<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="0"{{if or ($unit.Type.UnitGlobalDisabled) (eq ($.Team.UnitAccessMode $unit.Type) 0)}} checked{{end}}>
-													</div>
-												</td>
-												<td class="center aligned">
-													<div class="ui radio checkbox">
-														<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="1"{{if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $unit.Type) 1)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}}>
-													</div>
-												</td>
-												<td class="center aligned">
-													{{if ge $unit.MaxPerms 2}}
-													<div class="ui radio checkbox">
-														<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="2"{{if (eq ($.Team.UnitAccessMode $unit.Type) 2)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}}>
-													</div>
-													{{end}}
-												</td>
-											</tr>
+													</td>
+													<td class="center aligned">
+														<div class="ui radio checkbox">
+															<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="0"{{if or ($unit.Type.UnitGlobalDisabled) (eq ($.Team.UnitAccessMode $unit.Type) 0)}} checked{{end}}>
+														</div>
+													</td>
+													<td class="center aligned">
+														<div class="ui radio checkbox">
+															<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="1"{{if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $unit.Type) 1)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}}>
+														</div>
+													</td>
+													<td class="center aligned">
+														<div class="ui radio checkbox">
+															<input type="radio" class="hidden" name="unit_{{$unit.Type.Value}}" value="2"{{if (eq ($.Team.UnitAccessMode $unit.Type) 2)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}}>
+														</div>
+													</td>
+												</tr>
+											{{end}}
 										{{end}}
 									</tbody>
 								</table>
+								{{range $t, $unit := $.Units}}
+									{{if lt $unit.MaxPerms 2}}
+										{{if $unit.Type.UnitGlobalDisabled}}
+										<div class="field tooltip" data-content="{{$.i18n.Tr "repo.unit_disabled"}}">
+										{{else}}
+										<div class="field">
+										{{end}}
+											<div class="ui checkbox">
+												<input type="checkbox" class="hidden" name="unit_{{$unit.Type.Value}}" value="1"{{if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $unit.Type) 1)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}}>
+												<label>{{$.i18n.Tr $unit.NameKey}}{{if $unit.Type.UnitGlobalDisabled}} {{$.i18n.Tr "org.team_unit_disabled"}}{{end}}</label>
+												<span class="help">{{$.i18n.Tr $unit.DescKey}}</span>
+											</div>
+										</div>
+									{{end}}
+								{{end}}
 							</div>
 						{{end}}