diff --git a/WebApplication/Application.cpp b/WebApplication/Application.cpp
index 9ef8902..bdbff8d 100644
--- a/WebApplication/Application.cpp
+++ b/WebApplication/Application.cpp
@@ -85,10 +85,14 @@ void Application::authEvent() {
         LOG(info) << "User " << u.id() << " (" << u.identity(Wt::Auth::Identity::LoginName) << ")"
                   << " logged in.";
         if (m_loginPage) {
-            m_loginPageRef = m_navigationBar->addLoginItem(std::move(m_loginPage));
+            if (m_navigationBar != nullptr) {
+                m_loginPageRef = m_navigationBar->addLoginItem(std::move(m_loginPage));
+            }
         } else if (m_loginPageRef != nullptr && m_loginPageRef->parent() == m_root) {
             m_loginPage = m_loginPageRef->parent()->removeWidget(m_loginPageRef);
-            m_loginPageRef = m_navigationBar->addLoginItem(std::move(m_loginPage));
+            if (m_navigationBar != nullptr) {
+                m_loginPageRef = m_navigationBar->addLoginItem(std::move(m_loginPage));
+            }
         }
         setInternalPath("/", true);
         auto app = Amass::Singleton<WebToolkit::Server>::instance();
diff --git a/resources/auth_css_theme.xml b/resources/auth_css_theme.xml
index 1425aa7..ece9cd0 100644
--- a/resources/auth_css_theme.xml
+++ b/resources/auth_css_theme.xml
@@ -80,13 +80,13 @@
 
   <message id="Wt.Auth.template.registration">
     <div class="Wt-form Wt-auth-registration">
-      <h2>${tr:Wt.Auth.registration-form-title}</h2>
-      <p>${tr:Wt.Auth.registration-form-info}</p>
+      <h2 class="is-hidden">${tr:Wt.Auth.registration-form-title}</h2>
+      <p class="is-hidden">${tr:Wt.Auth.registration-form-info}</p>
 
       ${password-description}
 
-      <div class="Wt-fields">
-        ${<if:user-name>}
+      ${<if:user-name>}
+        <div class="bulma-field">
           <label for="${id:user-name}" class="bulma-label">
             ${user-name-label}
           </label>
@@ -99,51 +99,51 @@
           </div>
           ${user-name-info class="Wt-info bulma-help"}
           ${confirm-is-you class="Wt-info bulma-help"}
-        ${</if:user-name>}
+        </div>
+      ${</if:user-name>}
 
-        ${<if:choose-password>}
-          <div class="bulma-field">
-            <label for="${id:choose-password}">${tr:Wt.Auth.choose-password}
-              ${choose-password-info class="Wt-info"}
-            </label>
+      ${<if:choose-password>}
+        <div class="bulma-field">
+          <label for="${id:choose-password}">${tr:Wt.Auth.choose-password}
+          </label>
 
-            <div class="bulma-control bulma-has-icons-left">
-              ${choose-password class="bulma-input"}
-              <span class="bulma-icon bulma-is-small bulma-is-left">
-                <i class="fa-solid fa-lock"></i>
-              </span>
-            </div>
+          <div class="bulma-control bulma-has-icons-left">
+            ${choose-password class="bulma-input"}
+            <span class="bulma-icon bulma-is-small bulma-is-left">
+              <i class="fa-solid fa-lock"></i>
+            </span>
           </div>
-        ${</if:choose-password>}
+          ${choose-password-info class="Wt-info bulma-help"}
+        </div>
+      ${</if:choose-password>}
 
-        ${<if:repeat-password>}
-          <div>
-            <label for="${id:repeat-password}">${tr:Wt.Auth.repeat-password}
-              ${repeat-password-info class="Wt-info"}
-            </label>
-            <div class="bulma-control bulma-has-icons-left">
-              ${repeat-password class="bulma-input"}
-              <span class="bulma-icon bulma-is-small bulma-is-left">
-                <i class="fa-solid fa-lock"></i>
-              </span>
-            </div>
+      ${<if:repeat-password>}
+        <div class="bulma-field">
+          <label for="${id:repeat-password}">${tr:Wt.Auth.repeat-password}
+          </label>
+          <div class="bulma-control bulma-has-icons-left">
+            ${repeat-password class="bulma-input"}
+            <span class="bulma-icon bulma-is-small bulma-is-left">
+              <i class="fa-solid fa-lock"></i>
+            </span>
           </div>
-        ${</if:repeat-password>}
+          ${repeat-password-info class="Wt-info bulma-help"}
+        </div>
+      ${</if:repeat-password>}
 
-        ${<if:email>}
-          <div>
-            <label for="${id:email}">${tr:Wt.Auth.email}
-              ${email-info class="Wt-info"}
-            </label>
-            <div class="bulma-control bulma-has-icons-left">
-              ${email class="bulma-input"}
-              <span class="bulma-icon bulma-is-small bulma-is-left">
-                <i class="fa-solid fa-envelope"></i>
-              </span>
-            </div>
+      ${<if:email>}
+        <div class="bulma-field">
+          <label for="${id:email}">${tr:Wt.Auth.email}
+          </label>
+          <div class="bulma-control bulma-has-icons-left">
+            ${email class="bulma-input"}
+            <span class="bulma-icon bulma-is-small bulma-is-left">
+              <i class="fa-solid fa-envelope"></i>
+            </span>
           </div>
-        ${</if:email>}
-      </div>
+          ${email-info class="Wt-info bulma-help"}
+        </div>
+      ${</if:email>}
 
       ${<if:oauth>}
         <br clear="both" />
@@ -154,8 +154,8 @@
         ${icons}
       ${</if:oauth>}
 
-      <div class="Wt-buttons">
-        ${ok-button} ${cancel-button}
+      <div class="bulma-field bulma-is-grouped bulma-is-grouped-right">
+        ${ok-button class="bulma-is-primary"} ${cancel-button class="bulma-is-light"}
       </div>
     </div>
   </message>