diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index c83242754b..9b4e01597b 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -71,6 +71,9 @@ func SettingsPost(ctx *context.Context) {
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 	ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplSettingsOptions)
diff --git a/tests/integration/org_settings_test.go b/tests/integration/org_settings_test.go
index fde57e2e26..3ea6f10bf6 100644
--- a/tests/integration/org_settings_test.go
+++ b/tests/integration/org_settings_test.go
@@ -57,7 +57,9 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = "invalid"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK).Body)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", true)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Equal(t, "org3@example.com", org.Email)
@@ -69,7 +71,10 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = "example@example.com"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther).Body)
+		doc.AssertElement(t, "body", true)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", false)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Equal(t, "example@example.com", org.Email)
@@ -81,7 +86,10 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = ""
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther).Body)
+		doc.AssertElement(t, "body", true)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", false)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Empty(t, org.Email)