diff --git a/messages/en-US.json b/messages/en-US.json
index 88f48590..f531c7f9 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2102,5 +2102,6 @@
     "deviceOrganizationsAccess": "Access to all organizations your account has access to",
     "deviceAuthorize": "Authorize {applicationName}",
     "deviceConnected": "Device Connected!",
-    "deviceAuthorizedMessage": "Your device is authorized to access your account."
+    "deviceAuthorizedMessage": "Your device is authorized to access your account.",
+    "pangolinCloud": "Pangolin Cloud"
 }
diff --git a/server/private/lib/config.ts b/server/private/lib/config.ts
index e4a7a98b..5337ff3f 100644
--- a/server/private/lib/config.ts
+++ b/server/private/lib/config.ts
@@ -45,11 +45,10 @@ export class PrivateConfig {
 
         this.rawPrivateConfig = parsedPrivateConfig;
 
-        if (this.rawPrivateConfig.branding?.hide_auth_layout_footer) {
-            process.env.HIDE_AUTH_LAYOUT_FOOTER = JSON.stringify(
-                this.rawPrivateConfig.branding?.hide_auth_layout_footer
-            );
-        }
+        process.env.BRANDING_HIDE_AUTH_LAYOUT_FOOTER =
+            this.rawPrivateConfig.branding?.hide_auth_layout_footer === true
+                ? "true"
+                : "false";
 
         if (this.rawPrivateConfig.branding?.colors) {
             process.env.BRANDING_COLORS = JSON.stringify(
diff --git a/src/app/auth/layout.tsx b/src/app/auth/layout.tsx
index 378b62ee..47cd7944 100644
--- a/src/app/auth/layout.tsx
+++ b/src/app/auth/layout.tsx
@@ -76,35 +76,37 @@ export default async function AuthLayout({ children }: AuthLayoutProps) {
                             </span>
                         </a>
                         <Separator orientation="vertical" />
-                        <a
-                            href="https://pangolin.net/terms-of-service.html"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            aria-label="GitHub"
-                            className="flex items-center space-x-2 whitespace-nowrap"
-                        >
-                            <span>{t("terms")}</span>
-                        </a>
-                        <Separator orientation="vertical" />
-                        <a
-                            href="https://pangolin.net/privacy-policy.html"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            aria-label="GitHub"
-                            className="flex items-center space-x-2 whitespace-nowrap"
-                        >
-                            <span>{t("privacy")}</span>
-                        </a>
-                        <Separator orientation="vertical" />
-                        <a
-                            href="https://github.com/fosrl/pangolin/blob/main/SECURITY.md"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            aria-label="GitHub"
-                            className="flex items-center space-x-2 whitespace-nowrap"
-                        >
-                            <span>{t("security")}</span>
-                        </a>
+                        <span>
+                            {build === "oss"
+                                ? t("communityEdition")
+                                : build === "enterprise"
+                                  ? t("enterpriseEdition")
+                                  : t("pangolinCloud")}
+                        </span>
+                        {build === "saas" && (
+                            <>
+                                <Separator orientation="vertical" />
+                                <a
+                                    href="https://pangolin.net/terms-of-service.html"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    aria-label="GitHub"
+                                    className="flex items-center space-x-2 whitespace-nowrap"
+                                >
+                                    <span>{t("terms")}</span>
+                                </a>
+                                <Separator orientation="vertical" />
+                                <a
+                                    href="https://pangolin.net/privacy-policy.html"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    aria-label="GitHub"
+                                    className="flex items-center space-x-2 whitespace-nowrap"
+                                >
+                                    <span>{t("privacy")}</span>
+                                </a>
+                            </>
+                        )}
                         <Separator orientation="vertical" />
                         <a
                             href="https://docs.pangolin.net"
@@ -116,8 +118,6 @@ export default async function AuthLayout({ children }: AuthLayoutProps) {
                             <span>{t("docs")}</span>
                         </a>
                         <Separator orientation="vertical" />
-                        <span>{t("communityEdition")}</span>
-                        <Separator orientation="vertical" />
                         <a
                             href="https://github.com/fosrl/pangolin"
                             target="_blank"
diff --git a/src/components/DeviceAuthConfirmation.tsx b/src/components/DeviceAuthConfirmation.tsx
index 93344b60..a7987ccb 100644
--- a/src/components/DeviceAuthConfirmation.tsx
+++ b/src/components/DeviceAuthConfirmation.tsx
@@ -86,7 +86,7 @@ export function DeviceAuthConfirmation({
 
                 <div className="space-y-3">
                     <div className="flex items-start gap-3 p-3 bg-muted rounded-lg">
-                        <Monitor className="h-5 w-5 text-gray-600 mt-0.5" />
+                        <Monitor className="h-5 w-5 mt-0.5" />
                         <div className="flex-1">
                             <p className="text-sm font-medium">
                                 {metadata.applicationName}
@@ -106,11 +106,11 @@ export function DeviceAuthConfirmation({
                         <p className="text-sm font-medium">{t("deviceExistingAccess")}</p>
                         <div className="space-y-1 pl-4">
                             <div className="flex items-center gap-2 text-sm">
-                                <CheckCircle2 className="h-4 w-4 text-green-600" />
+                                <CheckCircle2 className="h-4 w-4 text-green-500" />
                                 <span>{t("deviceFullAccess")}</span>
                             </div>
                             <div className="flex items-center gap-2 text-sm">
-                                <CheckCircle2 className="h-4 w-4 text-green-600" />
+                                <CheckCircle2 className="h-4 w-4 text-green-500" />
                                 <span>
                                     {t("deviceOrganizationsAccess")}
                                 </span>
diff --git a/src/components/ui/alert.tsx b/src/components/ui/alert.tsx
index fb291022..c229b619 100644
--- a/src/components/ui/alert.tsx
+++ b/src/components/ui/alert.tsx
@@ -16,7 +16,7 @@ const alertVariants = cva(
                     "border-green-500/50 border bg-green-500/10 text-green-500 dark:border-success [&>svg]:text-green-500",
                 info: "border-blue-500/50 border bg-blue-500/10 text-blue-800 dark:border-blue-400 [&>svg]:text-blue-500",
                 warning:
-                    "border-yellow-500/50 border bg-yellow-500/10 text-yellow-800 dark:border-yellow-400 [&>svg]:text-yellow-500"
+                    "border-yellow-500 border text-yellow-800 bg-yellow-500/20 dark:bg-yellow-800/20 dark:text-yellow-100 dark:border-yellow-700 [&>svg]:text-yellow-500"
             }
         },
         defaultVariants: {