diff --git a/components/layout/Header.js b/components/layout/Header.js
index 3fa71147..2cad662c 100644
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@@ -46,7 +46,7 @@ export default function Header() {
         <div className={styles.buttons}>
           <ThemeButton />
           <LanguageButton menuAlign="right" />
-          {user && <UserButton />}
+          {user && !adminDisabled && <UserButton />}
         </div>
       </header>
     </>
diff --git a/pages/sso.js b/pages/sso.js
index 1ede73fd..17ffa6b8 100644
--- a/pages/sso.js
+++ b/pages/sso.js
@@ -13,7 +13,7 @@ export default function SingleSignOnPage() {
 
       router.push(url);
     }
-  }, [url, token]);
+  }, [router, url, token]);
 
   return null;
 }