diff --git a/plugins/auth/src/auth-oidc/index.js b/plugins/auth/src/auth-oidc/index.js
index 790101190a..c97a485b64 100644
--- a/plugins/auth/src/auth-oidc/index.js
+++ b/plugins/auth/src/auth-oidc/index.js
@@ -96,7 +96,7 @@ export default class openIdConnect {
   logout(authData, authOnLogoutFn) {
     const signoutData = {
       id_token_hint: authData && authData.idToken,
-      state: window.location.href
+      state: encodeURI(window.location.href)
     };
 
     return this.client
@@ -105,7 +105,7 @@ export default class openIdConnect {
         authOnLogoutFn();
         window.location = req.url;
       })
-      .catch(function(err) {
+      .catch(function (err) {
         console.error('[OIDC] logout() Error', err);
         authOnLogoutFn();
       });
@@ -176,7 +176,7 @@ export default class openIdConnect {
             Luigi.auth().store.removeAuthData();
             resolve(response);
           })
-          .catch(function(err) {
+          .catch(function (err) {
             reject(response);
             console.error('[OIDC] Logout Error', err);
           });
diff --git a/website/docs/src/client-js/outer-frame-handler.js b/website/docs/src/client-js/outer-frame-handler.js
index 4844e13234..005d8d0b80 100644
--- a/website/docs/src/client-js/outer-frame-handler.js
+++ b/website/docs/src/client-js/outer-frame-handler.js
@@ -9,7 +9,7 @@ import { isSearchBot } from './helpers';
 export class OuterFrameHandler {
   init() {
     if (this.outsideIframe() && !isSearchBot) {
-      const href = window.location.href;
+      const href = encodeURI(window.location.href);
       let newHref;
       if (href.includes('/docu-microfrontend')) {
         newHref = href.replace('/docu-microfrontend', '').replace('#', '?section=');
diff --git a/website/fiddle/public/auth/idpmock/logout.html b/website/fiddle/public/auth/idpmock/logout.html
index 02b0968b83..69f0a0d041 100644
--- a/website/fiddle/public/auth/idpmock/logout.html
+++ b/website/fiddle/public/auth/idpmock/logout.html
@@ -2,27 +2,24 @@
 <html>
 
 <head>
-	<title>Luigi Mock Identity Provider</title>
+  <title>Luigi Mock Identity Provider</title>
 </head>
 
 <body>
-	Logging out...
-	<script>
-		window.onload = function() {
-    let redirectTo = decodeURIComponent(
-      window.location.href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]
-    );
-    const decodeChars = (string) => {
-      return string.replace(/[<>'*+?^${}()|[\]\\]/g, '\\$&')
-    }
-    redirectTo = decodeChars(redirectTo);
-    if(!redirectTo.startsWith(window.location.origin)) {
-      console.warn("post_logout_redirect_uri has wrong input. You are redirected to /auth/logout.html!");
-      redirectTo = window.location.origin + '/auth/logout.html';
-    }
-    window.location.href = redirectTo; 
-  };
-	</script>
+  Logging out...
+  <script>
+    window.onload = function () {
+      let href = encodeURI(window.location.href);
+      const decodeChars = (string) => string.replace(/[<>'*+?^${}()|[\]\\]/g, '\\$&');
+      let redirectTo =
+        decodeChars(decodeURIComponent(href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]));
+      if (!redirectTo.startsWith(window.location.origin)) {
+        console.warn("post_logout_redirect_uri has wrong input. You are redirected to /auth/logout.html!");
+        redirectTo = '/auth/logout.html';
+      }
+      window.location.href = redirectTo;
+    };
+  </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/website/fiddle/public/auth/logout.html b/website/fiddle/public/auth/logout.html
index 300d82824c..2783e5887e 100644
--- a/website/fiddle/public/auth/logout.html
+++ b/website/fiddle/public/auth/logout.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -15,30 +16,34 @@
       font-size: 50px;
       color: #a0a0a0;
     }
+
     .fd-container--centered {
       text-align: center;
     }
-    .fd-container  {
+
+    .fd-container {
       padding-top: 20px;
     }
   </style>
   <script type="text/javascript">
     function login() {
-      window.location.href = window.location.origin;
+      window.location.href = '/';
     }
   </script>
 </head>
+
 <body>
-<div class="fd-container fd-container--centered">
-  <div class="fd-col--6 fd-col--shift-3">
-    <span class="sap-icon--log"></span>
-    <br />
+  <div class="fd-container fd-container--centered">
+    <div class="fd-col--6 fd-col--shift-3">
+      <span class="sap-icon--log"></span>
+      <br />
       Logout successful
-    <br />
-    <br />
-    <button class="fd-button" onclick="login()">Login again</button>
+      <br />
+      <br />
+      <button class="fd-button" onclick="login()">Login again</button>
+    </div>
   </div>
-</div>
 
 </body>
+
 </html>
\ No newline at end of file
