diff --git a/packages/api/src/auth/authProvider.js b/packages/api/src/auth/authProvider.js
index 6a226913e..fec800868 100644
--- a/packages/api/src/auth/authProvider.js
+++ b/packages/api/src/auth/authProvider.js
@@ -35,6 +35,10 @@ class AuthProviderBase {
   isLoginForm() {
     return false;
   }
+
+  getAdditionalConfigProps() {
+    return {};
+  }
 }
 
 class OAuthProvider extends AuthProviderBase {
@@ -92,6 +96,15 @@ class OAuthProvider extends AuthProviderBase {
 
     return { error: 'Token not found' };
   }
+
+  getAdditionalConfigProps() {
+    return {
+      oauth: process.env.OAUTH_AUTH,
+      oauthClient: process.env.OAUTH_CLIENT_ID,
+      oauthScope: process.env.OAUTH_SCOPE,
+      oauthLogout: process.env.OAUTH_LOGOUT,
+    };
+  }
 }
 
 class ADProvider extends AuthProviderBase {
@@ -176,7 +189,7 @@ function detectEnvAuthProvider() {
   if (process.env.AUTH_PROVIDER) {
     return process.env.AUTH_PROVIDER;
   }
-  
+
   if (process.env.STORAGE_DATABASE) {
     return 'denyall';
   }
diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index 2be7123fa..bcd8a3af3 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -32,6 +32,7 @@ module.exports = {
     const login = authProvider.getCurrentLogin(req);
     const permissions = authProvider.getCurrentPermissions(req);
     const isLoginForm = authProvider.isLoginForm();
+    const additionalConfigProps = authProvider.getAdditionalConfigProps();
 
     return {
       runAsPortal: !!connections.portalConnections,
@@ -43,10 +44,7 @@ module.exports = {
       isDocker: platformInfo.isDocker,
       permissions,
       login,
-      oauth: process.env.OAUTH_AUTH,
-      oauthClient: process.env.OAUTH_CLIENT_ID,
-      oauthScope: process.env.OAUTH_SCOPE,
-      oauthLogout: process.env.OAUTH_LOGOUT,
+      ...additionalConfigProps,
       isLoginForm,
       isAdminLoginForm: !!(process.env.STORAGE_DATABASE && process.env.ADMIN_PASSWORD && !process.env.BASIC_AUTH),
       storageDatabase: process.env.STORAGE_DATABASE,
diff --git a/packages/web/src/buttons/ToolStripContainer.svelte b/packages/web/src/buttons/ToolStripContainer.svelte
index f38683693..a8ec57a11 100644
--- a/packages/web/src/buttons/ToolStripContainer.svelte
+++ b/packages/web/src/buttons/ToolStripContainer.svelte
@@ -32,6 +32,7 @@
     display: flex;
     flex: 1;
     position: relative;
+    max-height: 100%;
   }
 
   .toolstrip {