diff --git a/order-events/app/events/billing/append_enrollment.py b/order-events/app/events/billing/append_enrollment.py
index 81ca3d4..a355cd1 100644
--- a/order-events/app/events/billing/append_enrollment.py
+++ b/order-events/app/events/billing/append_enrollment.py
@@ -96,7 +96,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         pass
 
     try:
-        author = data['author']
+        author = data.get('author')
         course_id = data['course']['id']
         course = course_layer.collection.get_items(
             KeyPair(
@@ -118,15 +118,21 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
                 'user': pick(('id', 'name'), data['user']),
                 'course': pick(('id', 'name'), data['course']),
                 'unit_price': course['unit_price'],
-                'author': {
-                    'id': author['user_id'],
-                    'name': author['name'],
-                },
                 # Post-migration: uncomment the following line
                 # 'enrolled_at': data['created_at'],
                 'enrolled_at': data['create_date'],
                 'created_at': now_,
-            },
+            }
+            | (
+                {
+                    'author': {
+                        'id': author['user_id'],
+                        'name': author['name'],
+                    }
+                }
+                if author
+                else {}
+            ),
             cond_expr='attribute_not_exists(sk)',
         )
     except Exception as exc:
diff --git a/order-events/app/events/billing/template.html b/order-events/app/events/billing/template.html
index 9fc1adb..43d30df 100644
--- a/order-events/app/events/billing/template.html
+++ b/order-events/app/events/billing/template.html
@@ -83,8 +83,8 @@
                 margin-bottom: 0.625rem;
             }
 
-            .text-nowrap {
-                text-wrap: nowrap;
+            .whitespace-nowrap {
+                white-space: nowrap;
             }
         </style>
     </head>
@@ -177,9 +177,9 @@
                     <tr>
                         <td>Colaborador</td>
                         <td>Curso</td>
-                        <td>Matriculado em</td>
+                        <td class="whitespace-nowrap">Matriculado em</td>
                         <td>Autor</td>
-                        <td>Valor unit.</td>
+                        <td class="whitespace-nowrap">Valor unit.</td>
                     </tr>
                 </thead>
                 <tbody>
@@ -187,12 +187,14 @@
                     <tr>
                         <td>{{ x.user.name }}</td>
                         <td>{{ x.course.name }}</td>
-                        <td class="text-nowrap">
+                        <td class="whitespace-nowrap">
                             {{ x.enrolled_at|datetime_format('%d/%m/%Y, %H:%M')
                             }}
                         </td>
-                        <td>{{ x.author.name }}</td>
-                        <td class="text-nowrap">{{ x.unit_price|currency }}</td>
+                        <td>{{ x.author.name if x.author else 'N/A' }}</td>
+                        <td class="whitespace-nowrap">
+                            {{ x.unit_price|currency }}
+                        </td>
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -204,7 +206,7 @@
                         >
                             Total
                         </td>
-                        <td>
+                        <td class="whitespace-nowrap">
                             {{ items|
                             map(attribute='unit_price')|map('float')|sum|currency
                             }}