diff --git a/src/login/Template.tsx b/src/login/Template.tsx
index 0f51d256..bce89108 100644
--- a/src/login/Template.tsx
+++ b/src/login/Template.tsx
@@ -72,7 +72,7 @@ export default function Template(props: Props) {
         >
             <DsfrHeader
                 brandTop={
-                    <div
+                    <span
                         dangerouslySetInnerHTML={{
                             __html: kcContext.properties.DSFR_THEME_BRAND_TOP
                         }}
diff --git a/src/shared/getColorScheme.ts b/src/shared/getColorScheme.ts
index 58a0dc88..2d736aba 100644
--- a/src/shared/getColorScheme.ts
+++ b/src/shared/getColorScheme.ts
@@ -10,10 +10,10 @@ export function setKcContextDarkModePolicy(params: {
 
 function getIsDark(): boolean | undefined {
     from_admin_policy: {
-        if (kcContextDarkMode === undefined || kcContextDarkMode === true) {
+        if (kcContextDarkMode === undefined) {
             break from_admin_policy;
         }
-        return false;
+        return kcContextDarkMode;
     }
 
     from_url: {