diff --git a/xml/dtd/offerte.xsd b/xml/dtd/offerte.xsd
index 033bf81..e9cd3ad 100644
--- a/xml/dtd/offerte.xsd
+++ b/xml/dtd/offerte.xsd
@@ -62,7 +62,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="organizational_readiness_assessment">
     <xs:complexType>
       <xs:sequence>
@@ -71,7 +71,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="team">
     <xs:complexType>
       <xs:sequence>
@@ -79,7 +79,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="member">
     <xs:complexType>
       <xs:sequence>
@@ -88,15 +88,15 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="expertise" type="xs:string"/>
   <xs:element name="security_incident_management" type="ir_service"/>
   <xs:element name="technical_artefact_analysis" type="ir_service"/>
-  
+
   <xs:complexType name="ir_service">
-      <xs:sequence>
-        <xs:element ref="rate"/>
-      </xs:sequence>
+    <xs:sequence>
+      <xs:element ref="rate"/>
+    </xs:sequence>
   </xs:complexType>
 
   <xs:element name="fee">
@@ -203,7 +203,7 @@
           <xs:element ref="contact"/>
           <xs:element ref="generate_targets"/>
           <xs:element name="generate_teammembers"/>
-          <xs:element ref="generate_offer_signature_box"/>
+          <xs:element ref="signature_box"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="optional" type="xs:ID"/>
@@ -223,13 +223,32 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="generate_offer_signature_box"/>
   <xs:element name="generate_permission_parties"/>
 
+  <xs:element name="signature_box">
+    <xs:complexType>
+      <xs:all>
+        <xs:element ref="client_side"/>
+        <xs:element ref="company_side"/>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="client_side" type="signature_box_column"/>
+  <xs:element name="company_side" type="signature_box_column"/>
+
+  <xs:complexType name="signature_box_column">
+    <xs:sequence>
+      <xs:element name="signee" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element name="date"/>
+      <xs:element name="place"/>
+    </xs:sequence>
+  </xs:complexType>
 
   <!-- Placeholders -->
   <xs:group name="placeholders">
     <xs:choice>
+      <xs:element name="latest_version_date"/>
       <xs:element name="client_long"/>
       <xs:element name="client_short"/>
       <xs:element name="client_street"/>
diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 51fcdba..8ee1ce8 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -385,6 +385,7 @@
   <!-- Placeholders -->
   <xs:group name="placeholders">
     <xs:choice>
+      <xs:element name="latest_version_date"/>
       <xs:element name="client_long"/>
       <xs:element name="client_short"/>
       <xs:element name="client_street"/>
diff --git a/xml/source/snippets/offerte/en/conditions.xml b/xml/source/snippets/offerte/en/conditions.xml
index 1f8f503..ef4d342 100644
--- a/xml/source/snippets/offerte/en/conditions.xml
+++ b/xml/source/snippets/offerte/en/conditions.xml
@@ -2,22 +2,15 @@
 <section>
   <title>Terms and Conditions</title>
   <p>
-    <company_short/> will only perform the
-    <company_svc_short/> if it has obtained the permission from
-    <generate_permission_parties/> as set out in the penetration testing waiver,
-    attached as <b>Annex 2</b>, or provided in a separate document.
-  </p>
+    <company_short/> will only perform the <company_svc_short/> if it has obtained the permission
+    from <generate_permission_parties/> as set out in the penetration testing waiver, attached as
+      <b>Annex 2</b>, or provided in a separate document. </p>
 
   <p>
-    <company_short/>
-    performs this assignment on the basis of its general terms and conditions,
-    which are attached to this offer as Annex 1.
-    <company_short/> rejects any general terms and conditions used by
-    <client_short/>.
-  </p>
-  <p>In order to agree to this offer, please sign this letter in duplicate and
-    return it to:
-  </p>
+    <company_short/> performs this assignment on the basis of its general terms and conditions,
+    which are attached to this offer as Annex 1. <company_short/> rejects any general terms and
+    conditions used by <client_short/>. </p>
+  <p>In order to agree to this offer, please sign this letter in duplicate and return it to: </p>
   <contact>
     <name>
       <company_legal_rep/>
@@ -30,7 +23,22 @@
       <company_postalcode/>
       <company_city/>
     </address>
-    <email><company_email/></email>
+    <email>
+      <company_email/>
+    </email>
   </contact>
-  <generate_offer_signature_box/>
-</section>
\ No newline at end of file
+
+  <signature_box>
+    <client_side>
+      <signee><client_legal_rep/></signee>
+      <date><latest_version_date/></date>
+      <place><client_city/></place>
+    </client_side>
+    <company_side>
+      <signee><company_legal_rep/></signee>
+      <signee>Its-a-meee!</signee>
+      <date><latest_version_date/></date>
+      <place><company_city/></place>
+    </company_side>
+  </signature_box>
+</section>
diff --git a/xml/xslt/auto.xslt b/xml/xslt/auto.xslt
index 3148b7c..f25ec22 100644
--- a/xml/xslt/auto.xslt
+++ b/xml/xslt/auto.xslt
@@ -309,142 +309,6 @@
         </fo:block>
     </xsl:template>
 
-    <xsl:template match="generate_offer_signature_box">
-
-        <xsl:call-template name="generateSignatureBox">
-            <xsl:with-param name="latestVersionDate" select="$latestVersionDate"/>
-        </xsl:call-template>
-    </xsl:template>
-
-    <xsl:template name="generateSignatureBox">
-        <xsl:param name="latestVersionDate"/>
-        <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
-            <fo:block xsl:use-attribute-sets="title-client">
-                <xsl:call-template name="getString">
-                    <xsl:with-param name="stringID" select="'signed_dupe'"/>
-                </xsl:call-template>
-            </fo:block>
-            <fo:block>
-                <fo:table xsl:use-attribute-sets="fwtable borders">
-                    <fo:table-column column-width="proportional-column-width(50)"
-                        xsl:use-attribute-sets="borders"/>
-                    <fo:table-column column-width="proportional-column-width(50)"
-                        xsl:use-attribute-sets="borders"/>
-                    <fo:table-body>
-                        <fo:table-row>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:value-of select="$latestVersionDate"/>
-                                </fo:block>
-                            </fo:table-cell>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:value-of select="$latestVersionDate"/>
-                                </fo:block>
-                            </fo:table-cell>
-                        </fo:table-row>
-                        <fo:table-row>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:value-of select="/*/meta/permission_parties/client/city"/>
-                                </fo:block>
-                            </fo:table-cell>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:value-of select="/*/meta/company/city"/>
-                                </fo:block>
-                            </fo:table-cell>
-                        </fo:table-row>
-                        <fo:table-row>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>&#160;</fo:block>
-                                <fo:block>&#160;</fo:block>
-                            </fo:table-cell>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>&#160;</fo:block>
-                                <fo:block>&#160;</fo:block>
-                            </fo:table-cell>
-                        </fo:table-row>
-                        <fo:table-row>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:choose>
-                                        <xsl:when test="/offerte">
-
-                                            <xsl:value-of
-                                                select="/*/meta/permission_parties/client/legal_rep"/>
-
-                                        </xsl:when>
-                                        <xsl:when test="/quickscope">
-
-                                            <xsl:value-of select="/*/customer/legal_rep"/>
-
-                                        </xsl:when>
-                                    </xsl:choose>
-
-                                </fo:block>
-                            </fo:table-cell>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block>
-                                    <xsl:choose>
-                                        <xsl:when test="/offerte">
-
-                                            <xsl:value-of select="/*/meta/company/legal_rep"/>
-
-                                        </xsl:when>
-                                        <xsl:when test="/quickscope">
-
-                                            <xsl:value-of select="/*/company/legal_rep"/>
-
-                                        </xsl:when>
-                                    </xsl:choose>
-
-                                </fo:block>
-                            </fo:table-cell>
-                        </fo:table-row>
-                        <fo:table-row>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block xsl:use-attribute-sets="bold">
-                                    <xsl:choose>
-                                        <xsl:when test="/offerte">
-
-                                            <xsl:value-of
-                                                select="/*/meta/permission_parties/client/full_name"/>
-
-                                        </xsl:when>
-                                        <xsl:when test="/quickscope">
-
-                                            <xsl:value-of select="/*/customer/full_name"/>
-
-                                        </xsl:when>
-                                    </xsl:choose>
-
-                                </fo:block>
-                            </fo:table-cell>
-                            <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block xsl:use-attribute-sets="bold">
-                                    <xsl:choose>
-                                        <xsl:when test="/offerte">
-
-                                            <xsl:value-of select="/*/meta/company/full_name"/>
-
-                                        </xsl:when>
-                                        <xsl:when test="/quickscope">
-
-                                            <xsl:value-of select="/*/company/full_name"/>
-
-                                        </xsl:when>
-                                    </xsl:choose>
-
-                                </fo:block>
-                            </fo:table-cell>
-                        </fo:table-row>
-                    </fo:table-body>
-                </fo:table>
-            </fo:block>
-        </fo:block>
-    </xsl:template>
-
     <xsl:template match="generate_permission_parties">
         <xsl:for-each select="/*/meta/permission_parties/client | /*/meta/permission_parties/party">
             <xsl:if test="self::party and not(following-sibling::party)">
diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt
index dffbbfd..21e9436 100644
--- a/xml/xslt/block.xslt
+++ b/xml/xslt/block.xslt
@@ -32,15 +32,15 @@
             <xsl:apply-templates/>
         </fo:block>
     </xsl:template>
-    
+
     <xsl:template match="li/p">
         <fo:block xsl:use-attribute-sets="li">
             <xsl:apply-templates/>
         </fo:block>
     </xsl:template>
-    
+
     <!-- special case for p in summary table to avoid checkiflast - all other elements can ignore mode -->
-    
+
     <xsl:template match="*" mode="summarytable">
         <xsl:apply-templates select="."/>
     </xsl:template>
@@ -49,8 +49,8 @@
     <xsl:template match="p" mode="summarytable">
         <xsl:apply-templates mode="summarytable"/>
     </xsl:template>
-    
-    
+
+
 
     <xsl:template match="pre">
         <fo:block xsl:use-attribute-sets="pre">
@@ -67,4 +67,125 @@
         </fo:block>
     </xsl:template>
 
+    <xsl:template match="signature_box">
+        <xsl:variable name="signee-difference"
+            select="count(client_side/signee) - count(company_side/signee)"/>
+        <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
+            <fo:block xsl:use-attribute-sets="title-client">
+                <xsl:call-template name="getString">
+                    <xsl:with-param name="stringID" select="'signed_dupe'"/>
+                </xsl:call-template>
+            </fo:block>
+            <fo:block>
+                <fo:table xsl:use-attribute-sets="fwtable borders">
+                    <fo:table-column column-width="proportional-column-width(50)"
+                        xsl:use-attribute-sets="borders"/>
+                    <fo:table-column column-width="proportional-column-width(50)"
+                        xsl:use-attribute-sets="borders"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block>For <fo:inline xsl:use-attribute-sets="bold"><xsl:value-of
+                                            select="//client/full_name"/></fo:inline></fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block>For <fo:inline xsl:use-attribute-sets="bold"><xsl:value-of
+                                            select="//company/full_name"/></fo:inline></fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <!-- client side -->
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:if test="$signee-difference &lt; 0">
+                                    <xsl:call-template name="insertEmptyBlocks">
+                                        <xsl:with-param name="times" select="abs($signee-difference)"/>
+                                    </xsl:call-template>
+                                </xsl:if>
+                                <xsl:for-each select="client_side/signee">
+                                    <xsl:call-template name="signeeBlock"/>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <!-- company side -->
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:if test="$signee-difference > 0">
+                                    <xsl:call-template name="insertEmptyBlocks">
+                                        <xsl:with-param name="times" select="$signee-difference"/>
+                                    </xsl:call-template>
+                                </xsl:if>
+                                <xsl:for-each select="company_side/signee">
+                                    <xsl:call-template name="signeeBlock"/>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="client_side/place">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="company_side/place">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                        </fo:table-row>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="client_side/date">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <xsl:for-each select="company_side/date">
+                                    <fo:block>
+                                        <xsl:apply-templates/>
+                                    </fo:block>
+                                </xsl:for-each>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
+        </fo:block>
+    </xsl:template>
+
+    <xsl:template name="signeeBlock">
+            <fo:block-container xsl:use-attribute-sets="signee">
+                <fo:block xsl:use-attribute-sets="signee_dottedline">
+                    <fo:leader leader-pattern="dots" leader-length="8cm"/>
+                </fo:block>
+                <fo:block xsl:use-attribute-sets="signee_name">
+                    <xsl:apply-templates/>
+                </fo:block>
+            </fo:block-container>
+        
+    </xsl:template>
+
+    <xsl:template name="emptyBlock">
+        <fo:block-container xsl:use-attribute-sets="signee">
+            <fo:block>&#160;
+            </fo:block>
+        </fo:block-container>
+    </xsl:template>
+
+    <xsl:template name="insertEmptyBlocks">
+        <xsl:param name="index" select="1"/>
+        <xsl:param name="times"/>
+
+        <xsl:call-template name="emptyBlock"/>
+
+        <xsl:if test="not($index = $times)">
+            <xsl:call-template name="insertEmptyBlocks">
+                <xsl:with-param name="index" select="$index + 1"/>
+                <xsl:with-param name="times" select="$times"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt
index 9b89a26..05f9382 100644
--- a/xml/xslt/placeholders.xslt
+++ b/xml/xslt/placeholders.xslt
@@ -25,6 +25,9 @@
 
 
     <!-- PLACEHOLDERS -->
+    <xsl:template match="latest_version_date">
+        <xsl:value-of select="$latestVersionDate"/>
+    </xsl:template>
     <xsl:template match="client_long">
         <xsl:param name="placeholderElement" select="/*/meta//client/full_name"/>
         <xsl:call-template name="checkPlaceholder">
diff --git a/xml/xslt/styles_off.xslt b/xml/xslt/styles_off.xslt
index d0175c0..a51ad35 100644
--- a/xml/xslt/styles_off.xslt
+++ b/xml/xslt/styles_off.xslt
@@ -27,8 +27,18 @@
     </xsl:attribute-set>
     
     <!-- service breakdown -->
+    <xsl:attribute-set name="signee">
+        <xsl:attribute name="height">2.75cm</xsl:attribute>
+    </xsl:attribute-set><xsl:attribute-set name="signee_name">
+        <xsl:attribute name="text-align">right</xsl:attribute>
+        <xsl:attribute name="margin-right">0.75cm</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="signee_dottedline">
+        <xsl:attribute name="margin-top">1.75cm</xsl:attribute>
+        <xsl:attribute name="text-align">right</xsl:attribute>
+    </xsl:attribute-set>
+
+<!-- Signature box -->
     <xsl:attribute-set name="moneycell">
         <xsl:attribute name="text-align-last">justify</xsl:attribute>
-    </xsl:attribute-set>
-    
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>