diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index f9ee15692c..faf803ee54 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -88,6 +88,9 @@ frappe.ui.form.ControlTextEditor = class ControlTextEditor extends frappe.ui.for
 	make_quill_editor() {
 		if (this.quill) return;
 		this.quill_container = $('<div>').appendTo(this.input_area);
+		if (this.df.max_height) {
+			$(this.quill_container).css({'max-height': this.df.max_height, 'overflow': 'auto'});
+		}
 		this.quill = new Quill(this.quill_container[0], this.get_quill_options());
 		this.bind_events();
 	}
diff --git a/frappe/templates/includes/footer/footer_info.html b/frappe/templates/includes/footer/footer_info.html
index a186247c9a..ba04949ec0 100644
--- a/frappe/templates/includes/footer/footer_info.html
+++ b/frappe/templates/includes/footer/footer_info.html
@@ -12,7 +12,11 @@
 		{# powered #}
 		<div class="footer-col-right col-sm-6 col-12 footer-powered">
 			{% block powered %}
-			{% include "templates/includes/footer/footer_powered.html" %}
+			{%- if footer_powered -%}
+				{{ footer_powered }}
+			{%- else -%}
+				{% include "templates/includes/footer/footer_powered.html" %}
+			{%- endif -%}
 			{% endblock %}
 		</div>
 	</div>
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 3f73892f90..2a6b3dc1fb 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -42,6 +42,7 @@
   "copyright",
   "address",
   "footer_items",
+  "footer_powered",
   "footer_template",
   "footer_template_values",
   "edit_footer_template_values",
@@ -142,7 +143,6 @@
   },
   {
    "collapsible": 1,
-   "collapsible_depends_on": "top_bar_items",
    "fieldname": "top_bar",
    "fieldtype": "Section Break",
    "label": "Navbar"
@@ -189,7 +189,8 @@
    "description": "Address and other legal information you may want to put in the footer.",
    "fieldname": "address",
    "fieldtype": "Text Editor",
-   "label": "Address"
+   "label": "Address",
+   "max_height": "8rem"
   },
   {
    "fieldname": "footer_items",
@@ -391,6 +392,7 @@
    "label": "App Logo"
   },
   {
+   "collapsible": 1,
    "fieldname": "account_deletion_settings_section",
    "fieldtype": "Section Break",
    "label": "Account Deletion Settings"
@@ -406,6 +408,11 @@
    "fieldname": "auto_account_deletion",
    "fieldtype": "Int",
    "label": "Auto Account Deletion within (Days)"
+  },
+  {
+   "fieldname": "footer_powered",
+   "fieldtype": "Small Text",
+   "label": "Footer \"Powered By\""
   }
  ],
  "icon": "fa fa-cog",
@@ -414,7 +421,7 @@
  "issingle": 1,
  "links": [],
  "max_attachments": 10,
- "modified": "2021-12-15 17:28:59.255184",
+ "modified": "2022-02-28 23:05:42.493192",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Settings",
@@ -437,5 +444,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 2dec14ab7a..2c28092aec 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -120,7 +120,8 @@ def get_website_settings(context=None):
 		"facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
 		"disable_signup", "hide_footer_signup", "head_html", "title_prefix",
 		"navbar_template", "footer_template", "navbar_search", "enable_view_tracking",
-		"footer_logo", "call_to_action", "call_to_action_url", "show_language_picker"]:
+		"footer_logo", "call_to_action", "call_to_action_url", "show_language_picker",
+		"footer_powered"]:
 		if hasattr(settings, k):
 			context[k] = settings.get(k)