diff --git a/web/static/invoice.css b/web/static/invoice.css
index 8829767..77c58cf 100644
--- a/web/static/invoice.css
+++ b/web/static/invoice.css
@@ -55,11 +55,16 @@
     text-align: right;
 }
 
-.invoice .notes, .invoice .payment-instructions {
+.invoice .notes, .invoice .payment-instructions, .invoice .terms_and_conditions {
     white-space: pre-line;
     text-align: left;
 }
 
+.invoice .terms_and_conditions {
+    text-transform: uppercase;
+    font-weight: bold;
+}
+
 .invoice .notes + .payment-instructions {
     margin-top: 5rem;
 }
diff --git a/web/template/quotes/view.gohtml b/web/template/quotes/view.gohtml
index fb59965..9755037 100644
--- a/web/template/quotes/view.gohtml
+++ b/web/template/quotes/view.gohtml
@@ -54,6 +54,10 @@
                 {{ .Quotee.City }} ({{ .Quotee.PostalCode}}), {{ .Quotee.Province }}<br>
             </address>
 
+            {{ if .TermsAndConditions -}}
+                <p class="terms_and_conditions">{{(gettext "Terms and Conditions:")}} {{ .TermsAndConditions }}</p>
+            {{- end }}
+            
             {{- $columns := 5 | add (len .TaxClasses) | add (boolToInt .HasDiscounts) -}}
             <table>
                 <thead>