diff --git a/src/pages/_includes/layout/page-header.html b/src/pages/_includes/layout/page-header.html
index 3b0535290..c9b57a900 100644
--- a/src/pages/_includes/layout/page-header.html
+++ b/src/pages/_includes/layout/page-header.html
@@ -1,31 +1,41 @@
+{% assign page-header = page.page-header | default: layout.page-header %}
+{% assign description = page.page-header-description | default: layout.page-header-description %}
+{% assign actions = page.page-header-actions | default: layout.page-header-actions %}
+{% assign pretitle = page.page-header-pretitle | default: layout.page-header-pretitle %}
+{% assign class = page.page-header-class | default: layout.page-header-class %}
+{% assign icon = page.page-header-icon | default: layout.page-header-icon %}
+
+
+{% if page-header %}
 <!-- Page title -->
-<div class="page-header{% if include.class %} {{ include.class }}{% endif %} d-print-none">
+<div class="page-header{% if class %} {{ class }}{% endif %} d-print-none">
 
 	<div class="row align-items-center">
 		<div class="col">
-			{% if include.pretitle %}
+			{% if pretitle %}
 			<!-- Page pre-title -->
 			<div class="page-pretitle">
-				{{ include.pretitle }}
+				{{ pretitle }}
 			</div>
 			{% endif %}
 			<h2 class="page-title">
-				{% if include.icon %}
-					{% include ui/icon.html icon=include.icon %}
+				{% if icon %}
+					{% include ui/icon.html icon=icon %}
 				{% endif %}
-				{{ include.title }}
+				{{ page-header }}
 			</h2>
 
-			{% if include.description %}
-				<div class="text-muted mt-1">{{ include.description }}</div>
+			{% if description %}
+				<div class="text-muted mt-1">{{ description }}</div>
 			{% endif %}
 		</div>
 
-		{% if include.actions %}
+		{% if actions %}
 			<!-- Page title actions -->
 			<div class="col-auto ml-auto d-print-none">
-				{% include layout/header-actions/{{ include.actions }}.html %}
+				{% include layout/header-actions/{{ actions }}.html %}
 			</div>
 		{% endif %}
 	</div>
 </div>
+{% endif %}
\ No newline at end of file
diff --git a/src/pages/_layouts/default.html b/src/pages/_layouts/default.html
index e8d731b46..b0e231e7e 100644
--- a/src/pages/_layouts/default.html
+++ b/src/pages/_layouts/default.html
@@ -2,30 +2,19 @@
 layout: base
 ---
 
-{% assign page-header = page.page-header | default: layout.page-header %}
-{% assign description = page.page-header-description | default: layout.page-header-description %}
-{% assign actions = page.page-header-actions | default: layout.page-header-actions %}
-{% assign pretitle = page.page-header-pretitle | default: layout.page-header-pretitle %}
-{% assign class = page.page-header-class | default: layout.page-header-class %}
-{% assign icon = page.page-header-icon | default: layout.page-header-icon %}
-
-
 {% if page.layout-sidebar %}
 	{% include layout/sidebar.html dark=page.layout-sidebar-dark right=page.layout-sidebar-right breakpoint="lg" %}
 {% endif %}
 
 <div class="page">
 	{% unless page.layout-hide-topbar %}
-		{% include layout/navbar.html condensed=page.layout-navbar-condensed overlap=page.layout-navbar-overlap dark=page.layout-navbar-dark hide-brand=page.layout-navbar-hide-brand hide-menu=page.layout-navbar-hide-menu 		{% include layout/navbar.html condensed=page.layout-navbar-condensed overlap=page.layout-navbar-overlap dark=page.layout-navbar-dark hide-brand=page.layout-navbar-hide-brand hide-menu=page.layout-navbar-hide-menu sticky=page.layout-navbar-sticky class=page.layout-navbar-class %}
+		{% include layout/navbar.html condensed=page.layout-navbar-condensed overlap=page.layout-navbar-overlap dark=page.layout-navbar-dark hide-brand=page.layout-navbar-hide-brand hide-menu=page.layout-navbar-hide-menu sticky=page.layout-navbar-sticky class=page.layout-navbar-class %}
 	{% endunless %}
 
 
-
 	<div class="content">
 		<div class="container{% if page.layout-fluid %}-fluid{% else %}-xl{% endif %}{% if page.container-centered %} d-flex flex-column justify-content-center{% endif %}">
-			{% if page-header %}
-				{% include layout/page-header.html title=page-header description=description actions=actions pretitle=pretitle icon=icon class=class %}
-			{% endif %}
+			{% include layout/page-header.html %}
 
 			{{ content }}
 		</div>