diff --git a/src/main/resources/META-INF/resources/cms2/base.css b/src/main/resources/META-INF/resources/cms2/base.css
index 06873d5..d532e94 100644
--- a/src/main/resources/META-INF/resources/cms2/base.css
+++ b/src/main/resources/META-INF/resources/cms2/base.css
@@ -13,6 +13,7 @@
 @import "../web_modules/sanitize.css/typography.css";
 /* */
 
+@import "./fonts/rochester.css";
 @import "./fonts/source.css";
 
 @viewport {
@@ -146,7 +147,8 @@
 
 .login-name {
   font-style: normal;
-  font-family: cursive;
+  font-size: larger;
+  font-family: Rochester, cursive;
 }
 
 body > main {
diff --git a/src/main/resources/META-INF/resources/cms2/fonts/rochester.css b/src/main/resources/META-INF/resources/cms2/fonts/rochester.css
new file mode 100644
index 0000000..272e915
--- /dev/null
+++ b/src/main/resources/META-INF/resources/cms2/fonts/rochester.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'Rochester';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Rochester'), local('Rochester-Regular'), url(rochester/Rochester-Regular.ttf) format('truetype'), url(https://matthias.benkard.de/cms2/fonts/rochester/Rochester-Regular.ttf) format('truetype');
+}
diff --git a/src/main/resources/META-INF/resources/cms2/fonts/rochester/Rochester-Regular.ttf b/src/main/resources/META-INF/resources/cms2/fonts/rochester/Rochester-Regular.ttf
new file mode 100644
index 0000000..8816dbd
--- /dev/null
+++ b/src/main/resources/META-INF/resources/cms2/fonts/rochester/Rochester-Regular.ttf
Binary files differ
diff --git a/src/main/resources/templates/tags/navbar.html b/src/main/resources/templates/tags/navbar.html
index 4774576..e6be2d5 100644
--- a/src/main/resources/templates/tags/navbar.html
+++ b/src/main/resources/templates/tags/navbar.html
@@ -13,7 +13,7 @@
 
   {#if inject:LoginStatus.loggedIn}
   <li class='{#if siteSection == "Login"}this-page{/} login-box logged-in' data-site-section="Login">
-    <div class="login-text">Logged in as: <span class="login-name">{inject:LoginStatus.userName}</span></div>
+    <div class="login-text">Logged in as:&ensp;<span class="login-name">{inject:LoginStatus.userName}</span></div>
   </li>
   {#else}
   <li class='{#if siteSection == "Login"}this-page{/} login-box logged-out' data-site-section="Login">