diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index 1e815cc9c971e7617d94a97c0bd81ad8acbe7aff..45af56099ff5c1350a2c3c9eea11add607137c25 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2018 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
           {{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 )  }}
           {{ end }}
           <li{{ if eq .p1 .p2 }} class="active" aria-current="page"{{ end }}>
-            <a href="{{ .p1.Permalink }}">{{ .p1.Title | safeHTML | title }}</a>
+            <a href="{{ .p1.Permalink }}">{{ if eq .Page.Params.format_title false }}{{ .p1.Title | safeHTML }}{{ else }}{{ .p1.Title | safeHTML | title }}{{ end }}</a>
           </li>
         {{ end }}
       </div>
diff --git a/layouts/partials/main_prefix.html b/layouts/partials/main_prefix.html
index cd5b9a86fe3e1f1df9cf048af26e0278556e4692..c0e60e39c7910851d1fc6ac6dde4b46e76ab673c 100644
--- a/layouts/partials/main_prefix.html
+++ b/layouts/partials/main_prefix.html
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Copyright (c) 2019 Eclipse Foundation, Inc.
 
   This program and the accompanying materials are made available under the
@@ -20,5 +20,11 @@
     {{ end }}
 
     {{ if ne .Page.Params.hide_page_title true }}
-      <h1>{{ .Title | safeHTML | title }}</h1>
-    {{ end }}
\ No newline at end of file
+      <h1>
+        {{ if eq .Page.Params.format_title false }}
+          {{ .Title | safeHTML }}
+        {{ else }}
+          {{ .Title | safeHTML | title }}
+        {{ end }}
+      </h1>
+    {{ end }}