diff --git a/shop/models.py b/shop/models.py
index 0ed28d3b..b3efe38e 100644
--- a/shop/models.py
+++ b/shop/models.py
@@ -27,7 +27,7 @@ class CustomOrder(CreatedUpdatedModel):
     )
 
     customer = models.TextField(
-        help_text=_('The customer info for this order, use <br> for newlines')
+        help_text=_('The customer info for this order')
     )
 
     amount = models.IntegerField(
diff --git a/shop/templates/pdf/custominvoice.html b/shop/templates/pdf/custominvoice.html
index 389508e3..20b406d1 100644
--- a/shop/templates/pdf/custominvoice.html
+++ b/shop/templates/pdf/custominvoice.html
@@ -8,13 +8,13 @@
         <td>
             <h3>
                 {{ invoice.created|date:"b jS, Y" }}<br>
-                Order CU#{{ invoice.customorder.pk }}<br>
+                Custom Order #{{ invoice.customorder.pk }}<br>
                 Invoice #{{ invoice.pk }}
             </h3>
         </td>
     </tr>
 </table>
-<h3>Customer: {{ invoice.customorder.customer }}</h3>
+<h3>Customer: {{ invoice.customorder.customer|linebreaks }}</h3>
 <br>
 <h2>INVOICE</h2>
 <table style="width:90%; margin:1em;">
@@ -25,7 +25,7 @@
         <b>Price
   <tr>
     <td>
-      {{ invoice.customorder.text }}
+      {{ invoice.customorder.text|linebreaks }}
     <td align="right">
       {{ invoice.customorder.amount|currency }}