diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js
index 4154861f84..657904f32e 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.js
+++ b/frappe/printing/page/print_format_builder/print_format_builder.js
@@ -280,10 +280,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
 				set_section(f.label);
 			} else if (f.fieldtype === "Column Break") {
 				set_column();
-			} else if (
-				!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) &&
-				f.label
-			) {
+			} else if (!in_list(frappe.model.layout_fields, f.fieldtype)) {
 				if (!column) set_column();
 
 				if (f.fieldtype === "Table") {
diff --git a/frappe/printing/page/print_format_builder/print_format_builder_field.html b/frappe/printing/page/print_format_builder/print_format_builder_field.html
index beb9de2f5a..90eb4f1f0a 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder_field.html
+++ b/frappe/printing/page/print_format_builder/print_format_builder_field.html
@@ -34,7 +34,7 @@
 			<span class="drag-handle">
 				<svg class="icon icon-xs"><use href="#icon-drag"></use></svg>
 			</span>
-			<span class="field-label">{{ __(field.label) }}
+			<span class="field-label">{{ __(field.label) || __(field.fieldname) }}
 				<span> ({%= __("Table") %})</span>
 			</span>
 			<a class="pull-right select-columns btn btn-default btn-xs">
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 03ba7c0880..2bfa7e7133 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -577,6 +577,8 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals
 
 			if not allow_read_on_all_link_options:
 				limited_to_user = True
+		else:
+			frappe.throw(_("You must be logged in to use this form."), frappe.PermissionError)
 
 	else:
 		for field in web_form_doc.web_form_fields:
@@ -607,4 +609,4 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals
 			return "\n".join([doc.value for doc in link_options])
 
 	else:
-		raise frappe.PermissionError(f"Not Allowed, {doctype}")
+		raise frappe.PermissionError(_("You don't have permission to access the {0} DocType.").format(doctype))
diff --git a/frappe/website/page_renderers/not_permitted_page.py b/frappe/website/page_renderers/not_permitted_page.py
index bd27150617..68d4efa939 100644
--- a/frappe/website/page_renderers/not_permitted_page.py
+++ b/frappe/website/page_renderers/not_permitted_page.py
@@ -14,9 +14,10 @@ class NotPermittedPage(TemplatePage):
 		return True
 
 	def render(self):
+		action = f"/login?redirect-to={frappe.request.path}"
 		frappe.local.message_title = _("Not Permitted")
 		frappe.local.response["context"] = dict(
-			indicator_color="red", primary_action="/login", primary_label=_("Login"), fullpage=True
+			indicator_color="red", primary_action=action, primary_label=_("Login"), fullpage=True
 		)
 		self.set_standard_path("message")
 		return super().render()
diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 04dfa5e097..586554efce 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -161,7 +161,7 @@ frappe.ready(function() {
 						.text("{{ _('Invalid Password') }}");
 				},
 				200: function(r) {
-					if (r.message && r.message.entropy) {
+					if (r.message && r.message.score) {
 						var score = r.message.score,
 							feedback = r.message.feedback;