diff --git a/vre-panel/pages/auth/signin.tsx b/vre-panel/pages/auth/signin.tsx
index 48d0c75..b6982dc 100644
--- a/vre-panel/pages/auth/signin.tsx
+++ b/vre-panel/pages/auth/signin.tsx
@@ -1,14 +1,25 @@
 import { getProviders, getSession, signIn } from "next-auth/react"
 import getConfig from 'next/config'
+import {useContext} from "react";
+import {PaasConfigContext} from "../../context/PaasConfig";
 
 const { publicRuntimeConfig } = getConfig()
 
 export default function SignIn({ providers }: { providers: any }) {
+
+    const {paasConfig, paasConfigLoading} = useContext(PaasConfigContext)
+
     return (
         <div className="mx-auto flex flex-col items-center justify-center h-screen">
             <img className="w-fit h-fit object-cover" src={`${publicRuntimeConfig.staticFolder}/LW_VLICVRE_logo.png`} />
             <div className="flex flex-col justify-center rounded-md overflow-hidden shadow-lg bg-white p-10 mt-10 w-screen">
-                <img src={`${publicRuntimeConfig.staticFolder}/LW_ERIC_Logo.png`} className="w-36 self-center" alt="LifeWatch Logo" />
+                {paasConfigLoading || (
+                    <img
+                        src={paasConfig.site_icon}
+                        alt="Site icon"
+                        className="h-16 self-center"
+                    />
+                )}
                 <>
                     {Object.values(providers).map((provider: any) => (
                         <div className="self-center" key={provider.name}>
diff --git a/vre-panel/templates/Nav.tsx b/vre-panel/templates/Nav.tsx
index 19439d3..8d156ca 100644
--- a/vre-panel/templates/Nav.tsx
+++ b/vre-panel/templates/Nav.tsx
@@ -18,15 +18,13 @@ const Nav = () => {
             <nav className="bg-white border-gray-200 px-2 sm:px-4 rounded dark:bg-gray-800">
                 <div className="container flex flex-wrap justify-between items-center mx-auto">
                     <Link href='/' className="flex items-center">
-                        {
-                            paasConfigLoading || (
+                        {paasConfigLoading || (
                             <img
                                 src={paasConfig.site_icon}
-                                alt="Site Logo"
+                                alt="Site icon"
                                 className="mr-3 h-16"
                             />
-                          )
-                        }
+                          )}
                     </Link>
                     <div className="flex items-center md:order-2">
                         <div className="relative inline-block text-left">