diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt
index 604ccdd..56130f4 100644
--- a/xml/xslt/block.xslt
+++ b/xml/xslt/block.xslt
@@ -98,7 +98,8 @@
                             <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:with-param name="times"
+                                            select="abs($signee-difference)"/>
                                     </xsl:call-template>
                                 </xsl:if>
                                 <xsl:for-each select="client_side/signee">
@@ -156,21 +157,34 @@
     </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:choose>
+            <xsl:when
+                test="(client_legal_rep and not(normalize-space(//client/legal_rep))) or (not(normalize-space(.)) and not(*))">
+                <!-- don't have a name, add dotted name line -->
+                <fo:block-container xsl:use-attribute-sets="signee">
+                    <fo:block xsl:use-attribute-sets="signee_signaturespace">
+                        <fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="8cm"/>
+                    </fo:block>
+                    <fo:block margin-top="0.2cm" margin-bottom="0.2cm">(Name:<fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="7cm"/>)</fo:block>
+                </fo:block-container>
+            </xsl:when>
+            <xsl:otherwise>
+                <fo:block-container xsl:use-attribute-sets="signee">
+                    <fo:block xsl:use-attribute-sets="signee_signaturespace">
+                        <fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="8cm"/>
+                    </fo:block>
+                    <fo:block xsl:use-attribute-sets="signee_name">
+                        <xsl:apply-templates/>
+                    </fo:block>
+                </fo:block-container>
+            </xsl:otherwise>
+        </xsl:choose>
+
     </xsl:template>
 
     <xsl:template name="emptyBlock">
         <fo:block-container xsl:use-attribute-sets="signee">
-            <fo:block>&#160;
-            </fo:block>
+            <fo:block>&#160; </fo:block>
         </fo:block-container>
     </xsl:template>
 
diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt
index 2bec35a..b8412e6 100644
--- a/xml/xslt/styles.xslt
+++ b/xml/xslt/styles.xslt
@@ -453,6 +453,7 @@
     <xsl:attribute-set name="totalcell"/>
     <xsl:attribute-set name="signee"/>
     <xsl:attribute-set name="signee_name"/>
+    <xsl:attribute-set name="signee_signaturespace"/>
     <xsl:attribute-set name="signee_dottedline"/>
     
 </xsl:stylesheet>
diff --git a/xml/xslt/styles_off.xslt b/xml/xslt/styles_off.xslt
index 42a2bb9..f1c05ea 100644
--- a/xml/xslt/styles_off.xslt
+++ b/xml/xslt/styles_off.xslt
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    exclude-result-prefixes="xs" xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
-    
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+
     <xsl:import href="styles.xslt"/>
-    
+
     <!-- variables -->
-    
+
     <!-- Text -->
     <xsl:attribute-set name="p">
         <xsl:attribute name="margin-bottom">
             <xsl:value-of select="$small-space"/>
         </xsl:attribute>
     </xsl:attribute-set>
-    
+
     <xsl:attribute-set name="title-2" use-attribute-sets="title">
-        <xsl:attribute name="color">black</xsl:attribute><!--
+        <xsl:attribute name="color">black</xsl:attribute>
+        <!--
         <xsl:attribute name="font-size">13pt</xsl:attribute>
         <xsl:attribute name="margin-bottom">0.3cm</xsl:attribute>
         <xsl:attribute name="margin-top">0.3cm</xsl:attribute>-->
     </xsl:attribute-set>
-    
+
     <!-- Pages -->
-    <xsl:attribute-set name="region-body-cover">
-    </xsl:attribute-set>
-    
+    <xsl:attribute-set name="region-body-cover"> </xsl:attribute-set>
+
     <!-- service breakdown -->
     <xsl:attribute-set name="totalcell">
         <xsl:attribute name="text-align-last">justify</xsl:attribute>
@@ -37,14 +36,19 @@
 
     <!-- Signature box -->
     <xsl:attribute-set name="signee">
-        <xsl:attribute name="height">2.75cm</xsl:attribute>
+        <xsl:attribute name="height">2.85cm</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-set name="signee_signaturespace">
         <xsl:attribute name="margin-top">1.75cm</xsl:attribute>
         <xsl:attribute name="text-align">right</xsl:attribute>
+        <xsl:attribute name="padding-bottom">0.2px</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="signee_dottedline">
+        <xsl:attribute name="leader-pattern">dots</xsl:attribute>
+        <xsl:attribute name="leader-pattern-width">2mm</xsl:attribute>
     </xsl:attribute-set>
 </xsl:stylesheet>
diff --git a/xml/xslt/waiver.xslt b/xml/xslt/waiver.xslt
index 32500a3..307ea7f 100644
--- a/xml/xslt/waiver.xslt
+++ b/xml/xslt/waiver.xslt
@@ -167,8 +167,8 @@
                                     <xsl:when test="not($signee_waiver_rep = '')">
                                         <!-- we have a name for the signee -->
                                         <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 xsl:use-attribute-sets="signee_signaturespace">
+                                                <fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="8cm"
                                                 />
                                             </fo:block>
                                             <fo:block xsl:use-attribute-sets="signee_name">
@@ -178,13 +178,12 @@
                                     </xsl:when>
                                     <xsl:otherwise>
                                         <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 xsl:use-attribute-sets="signee_signaturespace">
+                                                <fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="8cm"
                                                 />
                                             </fo:block>
+                    <fo:block margin-top="0.2cm" margin-bottom="0.2cm">(Name:<fo:leader xsl:use-attribute-sets="signee_dottedline" leader-length="7cm"/>)</fo:block>
                                         </fo:block-container>
-                                            <fo:block margin-top="0.2cm" margin-bottom="0.2cm">Name: <fo:leader leader-pattern="dots" leader-length="7.1cm"
-                                                /></fo:block>
                                     </xsl:otherwise>
                                 </xsl:choose>
                             </fo:table-cell>