diff --git a/core/src/navigation/services/navigation.js b/core/src/navigation/services/navigation.js
index 3b342eb13d..bf6c1674d8 100644
--- a/core/src/navigation/services/navigation.js
+++ b/core/src/navigation/services/navigation.js
@@ -205,11 +205,7 @@ class NavigationClass {
           this.buildVirtualTree(node, nodeNamesInCurrentPath, pathParams);
 
           // STANDARD PROCEDURE
-          let children = await this.getChildren(
-            node,
-            newContext,
-            nodeNamesInCurrentPath
-          );
+          let children = await this.getChildren(node, newContext);
           const newNodeNamesInCurrentPath = nodeNamesInCurrentPath.slice(1);
           result = this.buildNode(
             newNodeNamesInCurrentPath,
diff --git a/core/src/services/auth-layer.js b/core/src/services/auth-layer.js
index a889f46594..57bf08e464 100644
--- a/core/src/services/auth-layer.js
+++ b/core/src/services/auth-layer.js
@@ -128,13 +128,13 @@ class AuthLayerSvcClass {
     );
 
     if (hasAuthSuccessFulFn && AuthStoreSvc.isNewlyAuthorized()) {
-      AuthStoreSvc.removeNewlyAuthorized();
       await LuigiAuth.handleAuthEvent(
         'onAuthSuccessful',
         idpProviderSettings,
         authData
       );
     }
+    AuthStoreSvc.removeNewlyAuthorized();
 
     if (
       GenericHelpers.isFunction(
diff --git a/core/webpack-common-plugins.js b/core/webpack-common-plugins.js
deleted file mode 100644
index a3ab9488a3..0000000000
--- a/core/webpack-common-plugins.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-
-module.exports = {
-  copyWebpackPlugin: new CopyWebpackPlugin([
-    {
-      from: 'node_modules/oidc-client/dist/oidc-client.min.js',
-      to: 'auth/oidc/'
-    }
-  ])
-};
diff --git a/core/webpack-ie11.config.js b/core/webpack-ie11.config.js
index b4d389392a..ddde0496c9 100644
--- a/core/webpack-ie11.config.js
+++ b/core/webpack-ie11.config.js
@@ -1,7 +1,6 @@
 const path = require('path');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
-const commonPlugins = require('./webpack-common-plugins');
 const commonRules = require('./webpack-common-rules');
 const exec = require('child_process').exec;
 const fundamentalStyles = require('./fundamentalStyleClasses');
diff --git a/core/webpack.config.js b/core/webpack.config.js
index 1f6b7fa3df..44ae67c557 100644
--- a/core/webpack.config.js
+++ b/core/webpack.config.js
@@ -4,7 +4,6 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
   .BundleAnalyzerPlugin;
 const commonRules = require('./webpack-common-rules');
-const commonPlugins = require('./webpack-common-plugins');
 const exec = require('child_process').exec;
 const fundamentalStyles = require('./fundamentalStyleClasses');
 
diff --git a/plugins/auth/public/auth-oidc/.gitignore b/plugins/auth/public/auth-oidc/.gitignore
new file mode 100644
index 0000000000..bdffbb5799
--- /dev/null
+++ b/plugins/auth/public/auth-oidc/.gitignore
@@ -0,0 +1,2 @@
+# vendor
+oidc-client.min.js
\ No newline at end of file
diff --git a/plugins/auth/public/auth-oidc/silent-callback.html b/plugins/auth/public/auth-oidc/silent-callback.html
index d538e28fce..de59ae9a1b 100644
--- a/plugins/auth/public/auth-oidc/silent-callback.html
+++ b/plugins/auth/public/auth-oidc/silent-callback.html
@@ -1,4 +1,4 @@
-<script src="/assets/auth-oidc/plugin.js"></script>
+<script src="/assets/auth-oidc/oidc-client.min.js"></script>
 <script>
   var mgr = new Oidc.UserManager();
   mgr.signinSilentCallback().catch(error => {
diff --git a/plugins/auth/src/auth-oidc/index.js b/plugins/auth/src/auth-oidc/index.js
index 3c455674dd..879e6876af 100644
--- a/plugins/auth/src/auth-oidc/index.js
+++ b/plugins/auth/src/auth-oidc/index.js
@@ -1,4 +1,8 @@
-import Oidc from 'oidc-client';
+import {
+  UserManager,
+  WebStorageStateStore,
+  InMemoryWebStorage
+} from 'oidc-client';
 import { Helpers } from '../helpers';
 import { thirdPartyCookiesStatus } from '../third-party-cookies-check';
 export default class openIdConnect {
@@ -16,6 +20,7 @@ export default class openIdConnect {
       silent_redirect_uri:
         window.location.origin + '/assets/auth-oidc/silent-callback.html'
     };
+
     const mergedSettings = Helpers.deepMerge(defaultSettings, settings);
 
     // Prepend current url to redirect_uri, if it is a relative path
@@ -23,9 +28,27 @@ export default class openIdConnect {
       mergedSettings[key] = Helpers.prependOrigin(mergedSettings[key]);
     });
 
+    // set storage type
+    const storageType = Luigi.getConfigValue('auth.storage');
+    const isValidStore = ['none', 'sessionStorage', 'localStorage'].includes(
+      storageType
+    );
+    if (isValidStore && storageType == 'none') {
+      mergedSettings.userStore = new WebStorageStateStore({
+        store: new InMemoryWebStorage()
+      });
+      mergedSettings.stateStore = new WebStorageStateStore({
+        store: new InMemoryWebStorage()
+      });
+    } else if (isValidStore) {
+      mergedSettings.stateStore = new WebStorageStateStore({
+        store: window[storageType]
+      });
+    } // else fall back to OIDC default
+
     this.settings = mergedSettings;
 
-    this.client = new Oidc.UserManager(this.settings);
+    this.client = new UserManager(this.settings);
 
     this.client.events.addUserLoaded(async payload => {
       let profile = payload.profile;
@@ -168,9 +191,8 @@ export default class openIdConnect {
         return resolve(true);
       }
 
-      this.client
-        .signinRedirectCallback()
-        .then(authenticatedUser => {
+      this.tryToSignIn()
+        .then((authenticatedUser = {}) => {
           if (authenticatedUser.error) {
             return console.error(
               'Error',
@@ -211,4 +233,22 @@ export default class openIdConnect {
         });
     });
   }
+
+  async tryToSignIn() {
+    try {
+      // If the user was just redirected here from the sign in page, sign them in.
+      await this.client.signinRedirectCallback();
+      console.debug('User was redirected via the sign-in page. Now signed in.');
+    } catch (error) {
+      console.debug(
+        "Sign-in redirect callback doesn't work. Let's try a silent sign-in.",
+        error
+      );
+      // Barring that, if the user chose to have the Identity Server remember their
+      // credentials and permission decisions, we may be able to silently sign them
+      // back in via a background iframe.
+      await this.client.signinSilent();
+      console.debug('Silent sign-in completed.');
+    }
+  }
 }
diff --git a/plugins/auth/src/auth-oidc/webpack-extra.config.js b/plugins/auth/src/auth-oidc/webpack-extra.config.js
new file mode 100644
index 0000000000..771ac614d5
--- /dev/null
+++ b/plugins/auth/src/auth-oidc/webpack-extra.config.js
@@ -0,0 +1,18 @@
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+
+const pluginRoot = __dirname + '/../../../';
+module.exports = {
+  plugins: [
+    new CopyWebpackPlugin(
+      [
+        {
+          from: pluginRoot + 'node_modules/oidc-client/dist/oidc-client.min.js',
+          to: pluginRoot + 'auth/public/auth-oidc'
+        }
+      ],
+      {
+        verbose: true
+      }
+    )
+  ]
+};
diff --git a/plugins/package-lock.json b/plugins/package-lock.json
index 86ccfff10e..d3f5c3a6c3 100644
--- a/plugins/package-lock.json
+++ b/plugins/package-lock.json
@@ -998,6 +998,12 @@
       "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
       "dev": true
     },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
     "ansi-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -1068,6 +1074,21 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -1834,6 +1855,72 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "copy-webpack-plugin": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.3",
+        "find-cache-dir": "^2.1.0",
+        "glob-parent": "^3.1.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "minimatch": "^3.0.4",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^2.1.2",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "serialize-javascript": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+          "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+          "dev": true
+        }
+      }
+    },
     "core-js": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz",
@@ -2081,6 +2168,15 @@
         "randombytes": "^2.0.0"
       }
     },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -3271,6 +3367,28 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
@@ -3403,6 +3521,12 @@
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
       "dev": true
     },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
     "iltorb": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/iltorb/-/iltorb-2.4.3.tgz",
@@ -3438,6 +3562,12 @@
       "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
       "dev": true
     },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -3771,6 +3901,12 @@
       "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -8441,6 +8577,12 @@
         "simple-concat": "^1.0.0"
       }
     },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -9266,6 +9408,16 @@
         "yargs": "^12.0.5"
       }
     },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
     "webpack-sources": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
diff --git a/plugins/package.json b/plugins/package.json
index cd87fd33ac..568f5cf8c3 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -37,9 +37,11 @@
     "acorn": "^6.0.5",
     "babel-loader": "^8.0.5",
     "bundlesize": "^0.17.0",
+    "copy-webpack-plugin": "^5.1.1",
     "core-js": "^3.0.1",
     "diff": ">=3.5.0",
     "lodash": ">=4.17.13",
+    "lodash.merge": "^4.6.2",
     "mixin-deep": ">=1.3.2",
     "npm": ">=6.13.4",
     "oidc-client": "^1.10.1",
diff --git a/plugins/webpack.config.js b/plugins/webpack.config.js
index 48ec0ad591..4216e45e58 100644
--- a/plugins/webpack.config.js
+++ b/plugins/webpack.config.js
@@ -1,10 +1,13 @@
 const path = require('path');
+const fs = require('fs');
 const glob = require('glob');
+const merge = require('lodash.merge');
+
 const { readFileSync } = require('fs');
 
 const babelSettings = JSON.parse(readFileSync('.babelrc'));
 
-module.exports = {
+const config = {
   entry: glob.sync('./auth/**/index.js').reduce((acc, path) => {
     const entry = path.replace('/index.js', '').replace('./auth/src/', '');
     acc[entry] = path;
@@ -32,3 +35,10 @@ module.exports = {
     ]
   }
 };
+
+// Extend with custom webpack configuration:
+glob.sync('./auth/**/webpack-extra.config.js').forEach(path => {
+  merge(config, require(path));
+});
+
+module.exports = config;
diff --git a/scripts/oidc-mockserver/clients-config.json b/scripts/oidc-mockserver/clients-config.json
index 867bdddf1e..b8ad4fb5da 100644
--- a/scripts/oidc-mockserver/clients-config.json
+++ b/scripts/oidc-mockserver/clients-config.json
@@ -7,7 +7,7 @@
     "AutomaticRedirectAfterSignout": true,
     "RedirectUris": [
       "http://localhost:4200",
-      "http://localhost:4200/assets/auth-oidc"
+      "http://localhost:4200/assets/auth-oidc/silent-callback.html"
     ],
     "PostLogoutRedirectUris": ["http://localhost:4200/logout.html"],
     "AllowedScopes": ["openid", "profile", "email"],