diff --git a/APPL/BEZ/bez.js b/APPL/BEZ/bez.js
index 7d7a848081..08db54b46c 100644
--- a/APPL/BEZ/bez.js
+++ b/APPL/BEZ/bez.js
@@ -9,6 +9,6 @@ function printBadge(evt, pbez_key)
 { // Printen van de bezoekers badge
   FcltMgr.stopPropagation(evt); // This prevents the event from bubbling up to the onclick event handler for the line.
 
-  window.open("bez_xml.asp?bez_key=" + pbez_key, "", "resizable=0,scrollbars=0,menubar=0,width=500,height=400");
+  window.open("bez_xml.asp?badge=1&bez_key=" + pbez_key, "", "resizable=0,scrollbars=0,menubar=0,width=500,height=400");
 }
 
diff --git a/APPL/BEZ/bez_xml.asp b/APPL/BEZ/bez_xml.asp
index 3f9420bc7a..4f3aa1b7ae 100644
--- a/APPL/BEZ/bez_xml.asp
+++ b/APPL/BEZ/bez_xml.asp
@@ -21,6 +21,7 @@
 
 <%
    var bez_key = getQParamInt("bez_key", -1);
+   var dobadge = getQParamInt("badge", 0) == 1;
 
    if (bez_key != -1) {
       var sql = "SELECT bez_afspraak_key"
@@ -33,7 +34,13 @@
       var this_bez = bez.func_enabled_afspraak(afspr_key);
       user.auth_required_or_abort(this_bez.canBadge);
 
-      FCLT2XMLResponse({xmlnode: 'afspraak', key: afspr_key, xtrakey: bez_key, srtnotificatie: 'BEZDON'});
+      //FCLT2XMLResponse({xmlnode: 'afspraak', key: afspr_key, xtrakey: bez_key, srtnotificatie: 'BEZDON'});
+      // Raar: bezdon = binnen, en dan komt er een badge-bon. Je zou een logische mechanisme met
+      // een parameter oid voor kunnen stellen.
+      if (dobadge)
+        FCLT2XMLResponse({xmlnode: 'bezoeker', key: bez_key, srtnotificatie: 'BEZBAD'});
+      else
+        FCLT2XMLResponse({xmlnode: 'bezoeker', key: bez_key});
    }
    else {
       var afspr_key = getQParamInt("afspr_key");
diff --git a/APPL/Shared/default.xsl b/APPL/Shared/default.xsl
index 77b17d906e..aec326ec6e 100644
--- a/APPL/Shared/default.xsl
+++ b/APPL/Shared/default.xsl
@@ -715,7 +715,7 @@ SUMMARY;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_activitei
 DESCRIPTION;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_activiteit/opmerking"/>
 LOCATION;ENCODING=QUOTED-PRINTABLE:<xsl:value-of select="rsv_ruimte/res_ruimte/nr"/>
 ORGANIZER;CN=<xsl:value-of select="rsv_ruimte/contact_user/naam_full"/>:MAILTO:reservering-noreply@facilitor.nl
-<xsl:for-each select="rsv_ruimte/afspraak/bez_bezoeker">
+<xsl:for-each select="rsv_ruimte/afspraak/bezoeker">
 ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;CN=<xsl:value-of select="naam"/>
 <xsl:if test="string(bedrijf)!=''"> (<xsl:value-of select="bedrijf"/>)</xsl:if>:MAILTO:<xsl:if test="boolean(intern_user)">
 <xsl:value-of select="intern_user/email"/></xsl:if></xsl:for-each>
@@ -940,7 +940,7 @@ END:VCALENDAR
         <TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"/>
         <TD>
           <xsl:choose>
-            <xsl:when test="not(boolean(bez_bezoeker))">
+            <xsl:when test="not(boolean(bezoeker))">
               <table>
                 <tr>
                   <td height="20"/>
@@ -1036,7 +1036,7 @@ END:VCALENDAR
                   <td height="20px"/>
                 </tr>
                 <!-- afspraak -->
-                <xsl:for-each select="bez_bezoeker">
+                <xsl:for-each select="bezoeker">
                   <xsl:sort select="naam"/>
                   <xsl:choose>
                     <xsl:when test="position() = 1">
@@ -1083,27 +1083,6 @@ END:VCALENDAR
     </TABLE>
   </xsl:template>
 
-  <xsl:template match="afspraak" mode="badge">
-    <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
-      <tr>
-        <td style="text-align:center; font-size:30px; font-weight: bold; height:60px;"><xsl:value-of select="//lcl/BEZ/bezoeker"/></td>
-      </tr>
-      <tr>
-        <td style="text-align:center; font-size:16px; font-weight: bold; height:20px;"><xsl:value-of select="bez_bezoeker/naam"/></td>
-      </tr>
-      <tr>
-        <td style="text-align:center; font-size:16px; font-weight: bold;"><xsl:value-of select="bez_bezoeker/bedrijf"/></td>
-      </tr>
-      <tr>
-        <td style="text-align:right;">
-          <xsl:element name="img">
-            <xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
-          </xsl:element>
-        </td>
-      </tr>
-    </TABLE>
-  </xsl:template>
-
 
   <xsl:template match="afspraak" mode="full">
        <xsl:choose>
@@ -1133,6 +1112,90 @@ END:VCALENDAR
       </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="bezoeker" mode="include">
+      <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+          <TR>
+              <TD WIDTH="40" ROWSPAN="30" ID="LINKERMARGE"/>
+              <TD>
+              <table border="0" bordercolor="#ffffff" width="100%">
+                <tr>
+                  <td class="caption" valign="top" colspan="2"><xsl:value-of select="//lcl/BEZ/bezoeker"/>&#xA0;<xsl:value-of select="naam"/><br/></td>
+                </tr>
+                 <tr>
+                   <td class="label" width="20%"><xsl:value-of select="//lcl/FAC/bedrijf"/></td>
+                     <td class="value">: <xsl:value-of select="bedrijf"/></td>
+                 </tr>
+                  <xsl:for-each select="kenmerk[@type!='L' and @type!='l' and @type!='Q' and count(@xmlnode)=0]">
+                  <xsl:sort select="@volgnummer" data-type="number"/>
+                  <xsl:if test=".!=''">
+                      <tr>
+                         <td class="label"><xsl:value-of select="@naam"/>:</td>
+                         <td class="value">: <xsl:value-of select="."/></td>
+                      </tr>
+                  </xsl:if>
+                  </xsl:for-each>
+                 <xsl:if test="deel"><tr><td></td><td class="value">: <xsl:value-of select="//lcl/BEZ/parkeerplaats_gereserveerd"/></td></tr></xsl:if>
+                <tr>
+                  <td class="label" width="20%"><xsl:value-of select="//lcl/BEZ/op_bezoek_bij"/></td>
+                  <td class="value" width="80%">: <xsl:value-of select="afspraak/host_user/naam_full"/></td>
+                </tr>
+                 <xsl:if test="done"><tr></tr><tr><td class="label"><xsl:value-of select="//lcl/BEZ/tijd_bezoek"/></td><td class="value">: <xsl:value-of select="done/datum"/>&#xA0;<xsl:value-of select="done/tijd"/> - <xsl:value-of select="out/datum"/>&#xA0;<xsl:value-of select="out/tijd"/></td></tr></xsl:if>
+              </table>
+              </TD>
+              <TD WIDTH="30" ROWSPAN="30" ID="RECHTERMARGE"/>
+          </TR>
+      </TABLE>
+  </xsl:template>
+
+  <xsl:template match="bezoeker" mode="badge">
+    <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
+      <tr>
+        <td style="text-align:center; font-size:30px; font-weight: bold; height:60px;"><xsl:value-of select="//lcl/BEZ/bezoeker"/></td>
+      </tr>
+      <tr>
+        <td style="text-align:center; font-size:16px; font-weight: bold; height:20px;"><xsl:value-of select="naam"/></td>
+      </tr>
+      <tr>
+        <td style="text-align:center; font-size:16px; font-weight: bold;"><xsl:value-of select="bedrijf"/></td>
+      </tr>
+      <tr>
+        <td style="text-align:right;">
+          <xsl:element name="img">
+            <xsl:attribute name="src">../../cust/<xsl:value-of select="//header/custId"/>/tmpl_logo.gif</xsl:attribute>
+          </xsl:element>
+        </td>
+      </tr>
+    </TABLE>
+  </xsl:template>
+
+  <xsl:template match="bezoeker" mode="full">
+       <xsl:choose>
+            <xsl:when test="$mode='summary'"></xsl:when>
+       <xsl:otherwise>
+    <html>
+      <xsl:comment>================================ BEZOEKER ==============================</xsl:comment>
+      <xsl:comment>FACILITOR default XSL template for bezoeker</xsl:comment>
+      <xsl:call-template name="htmlhead"/>
+      <xsl:element name="body">
+        <xsl:if test="$mode!='email'">
+          <xsl:attribute name="onload">window.print();</xsl:attribute>
+        </xsl:if>
+        <xsl:choose>
+          <xsl:when test="$srtnotificatiecode = 'BEZBAD'">
+            <xsl:apply-templates select="." mode="badge"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="pageheader"/>
+            <xsl:apply-templates select="." mode="include"/>
+            <xsl:call-template name="pagefooter"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:element>
+    </html>
+       </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="melding" mode="include">
     <table border="0" width="100%" cellpadding="2">
       <tr>
@@ -2091,7 +2154,7 @@ END:VCALENDAR
       </td>
     </tr>
     <!-- afspraak-lijst gesorteerd op naam -->
-    <xsl:for-each select="afspraak/bez_bezoeker">
+    <xsl:for-each select="afspraak/bezoeker">
       <xsl:sort select="naam"/>
       <xsl:choose>
         <xsl:when test="position() = 1">
@@ -3060,6 +3123,7 @@ END:VCALENDAR
         <xsl:apply-templates select="bestelopdracht" mode="full"/>
         <xsl:apply-templates select="reservering" mode="full"/>
         <xsl:apply-templates select="afspraak" mode="full"/>
+        <xsl:apply-templates select="bezoeker" mode="full"/>
         <xsl:apply-templates select="melding" mode="full"/>
         <xsl:apply-templates select="opdracht" mode="full"/>
         <xsl:apply-templates select="scenario" mode="full"/>