diff --git a/APPL/Shared/Login.inc b/APPL/Shared/Login.inc
index 6a1a74d712..0f10508261 100644
--- a/APPL/Shared/Login.inc
+++ b/APPL/Shared/Login.inc
@@ -968,6 +968,12 @@ function jwt_decode(token)
   try
   {
       // base64 decode and parse JSON
+
+      // FSN#39763  SLNKDWF.DLL v4.16 heeft nog een bug in het decoderen van
+      //            url-safe encoded teksten. Daarom hier voor-corrigeren
+      result.headerSeg  = result.headerSeg.replace(/\-/g, "+").replace(/\_/g, "/");
+      result.payloadSeg = result.payloadSeg.replace(/\-/g, "+").replace(/\_/g, "/");
+
       result.header = JSON.parse(oCrypto.base64_decode(result.headerSeg));
       result.payload = JSON.parse(oCrypto.base64_decode(result.payloadSeg));
   }