<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl
index 2087bc9f0..bcd4c09f1 100755
--- a/src/main/resources/templates/admin/admin_index.ftl
+++ b/src/main/resources/templates/admin/admin_index.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.index.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.index.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_login.ftl b/src/main/resources/templates/admin/admin_login.ftl
index 7ad0a81db..87304c184 100755
--- a/src/main/resources/templates/admin/admin_login.ftl
+++ b/src/main/resources/templates/admin/admin_login.ftl
@@ -5,7 +5,7 @@
-
${options.blog_title} | <@spring.message code='login.page.title' />
+
${options.blog_title!} | <@spring.message code='login.page.title' />
diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl
index c624a4648..11fb3142d 100644
--- a/src/main/resources/templates/admin/admin_menu.ftl
+++ b/src/main/resources/templates/admin/admin_menu.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.menus.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.menus.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index df33d5a77..febf2cdc2 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -1,5 +1,5 @@
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.setting.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.setting.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl
index 75687c618..ed91ece24 100755
--- a/src/main/resources/templates/admin/admin_page.ftl
+++ b/src/main/resources/templates/admin/admin_page.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_gallery.ftl b/src/main/resources/templates/admin/admin_page_gallery.ftl
index 5ca776854..06b6314e8 100644
--- a/src/main/resources/templates/admin/admin_page_gallery.ftl
+++ b/src/main/resources/templates/admin/admin_page_gallery.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.galleries.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.galleries.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_link.ftl b/src/main/resources/templates/admin/admin_page_link.ftl
index 1dedd0545..561ee57b8 100755
--- a/src/main/resources/templates/admin/admin_page_link.ftl
+++ b/src/main/resources/templates/admin/admin_page_link.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.links.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.links.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl
index 1a99142a9..bb1db0839 100755
--- a/src/main/resources/templates/admin/admin_page_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.pages.edit.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.pages.edit.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl
index d71e1f9db..a8088efcb 100755
--- a/src/main/resources/templates/admin/admin_post.ftl
+++ b/src/main/resources/templates/admin/admin_post.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
- <@head>${options.blog_title} | <@spring.message code='admin.posts.title' />@head>
+ <@head>${options.blog_title!} | <@spring.message code='admin.posts.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl
index 8fd61eb78..4036effbc 100755
--- a/src/main/resources/templates/admin/admin_post_md_editor.ftl
+++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.posts.edit.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.posts.edit.title' />@head>
<#include "module/_header.ftl">
@@ -47,7 +47,7 @@
<@spring.message code='admin.editor.form.url' />
- ${options.blog_url}/archives/<#if post??>${post.postUrl}#if>/
+ ${options.blog_url!}/archives/<#if post??>${post.postUrl}#if>/
diff --git a/src/main/resources/templates/admin/admin_profile.ftl b/src/main/resources/templates/admin/admin_profile.ftl
index cd3f59b91..21c8edeef 100644
--- a/src/main/resources/templates/admin/admin_profile.ftl
+++ b/src/main/resources/templates/admin/admin_profile.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.user.profile.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.user.profile.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_tag.ftl b/src/main/resources/templates/admin/admin_tag.ftl
index f26cbebe2..ce4f0b57f 100755
--- a/src/main/resources/templates/admin/admin_tag.ftl
+++ b/src/main/resources/templates/admin/admin_tag.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.tags.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.tags.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_theme-editor.ftl b/src/main/resources/templates/admin/admin_theme-editor.ftl
index 2533762f5..9972ba7d7 100644
--- a/src/main/resources/templates/admin/admin_theme-editor.ftl
+++ b/src/main/resources/templates/admin/admin_theme-editor.ftl
@@ -1,5 +1,5 @@
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.themes.edit.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.themes.edit.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/admin/admin_theme.ftl b/src/main/resources/templates/admin/admin_theme.ftl
index 75ba1dc3c..08449322c 100755
--- a/src/main/resources/templates/admin/admin_theme.ftl
+++ b/src/main/resources/templates/admin/admin_theme.ftl
@@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
-<@head>${options.blog_title} | <@spring.message code='admin.themes.title' />@head>
+<@head>${options.blog_title!} | <@spring.message code='admin.themes.title' />@head>
<#include "module/_header.ftl">
diff --git a/src/main/resources/templates/common/error/500.ftl b/src/main/resources/templates/common/error/500.ftl
index 2a5fd38fe..1ba070fbe 100644
--- a/src/main/resources/templates/common/error/500.ftl
+++ b/src/main/resources/templates/common/error/500.ftl
@@ -35,7 +35,7 @@