Merge branch 'V202108' into V20210731.patch

templates/user/settings/profile.tmpl

@@ -23,7 +23,7 @@
 				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{.i18n.Tr "email"}}</label>
-					<input id="email" name="email" value="{{.SignedUser.Email}}">
+					<input id="email" name="email" disabled value="{{.SignedUser.Email}}">
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox" id="keep-email-private">