diff --git a/app/main/views/providers.py b/app/main/views/providers.py
index 09b6558bb..3d3611d84 100644
--- a/app/main/views/providers.py
+++ b/app/main/views/providers.py
@@ -33,14 +33,11 @@ def view_providers():
 
 
 def add_monthly_traffic(domestic_sms_providers):
-    total_sms_sent = sum(provider.get('current_month_billable_sms', 0) for provider in domestic_sms_providers)
+    total_sms_sent = sum(provider['current_month_billable_sms'] for provider in domestic_sms_providers)
 
     for provider in domestic_sms_providers:
-        if provider.get('current_month_billable_sms'):
-            percentage = (provider['current_month_billable_sms'] / total_sms_sent * 100) if total_sms_sent else 0
-            provider['monthly_traffic'] = round(percentage)
-        else:
-            provider['monthly_traffic'] = 0
+        percentage = (provider['current_month_billable_sms'] / total_sms_sent * 100) if total_sms_sent else 0
+        provider['monthly_traffic'] = round(percentage)
 
 
 @main.route("/provider/<provider_id>/edit", methods=['GET', 'POST'])
diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html
index a2ea71b2c..027afc951 100644
--- a/app/templates/views/providers/providers.html
+++ b/app/templates/views/providers/providers.html
@@ -1,5 +1,5 @@
 {% extends "views/platform-admin/_base_template.html" %}
-{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading, optional_text_field %}
 {% from "components/show-more.html" import show_more %}
 
 {% block per_page_title %}
@@ -35,11 +35,7 @@ Providers
           {{ text_field('None') }}
       {% endif %}
 
-      {% if item.created_by %}
-          {{ text_field(item.created_by.name) }}
-      {% else %}
-          {{ text_field('None') }}
-      {% endif %}
+      {{ optional_text_field(item.created_by_name, default='None') }}
 
       {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
 
@@ -68,11 +64,7 @@ Providers
           {{ text_field('None') }}
       {% endif %}
 
-      {% if item.created_by %}
-          {{ text_field(item.created_by.name) }}
-      {% else %}
-          {{ text_field('None') }}
-      {% endif %}
+      {{ optional_text_field(item.created_by_name, default='None') }}
 
       {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
 
@@ -101,11 +93,7 @@ Providers
           {{ text_field('None') }}
       {% endif %}
 
-      {% if item.created_by %}
-          {{ text_field(item.created_by.name) }}
-      {% else %}
-          {{ text_field('None') }}
-      {% endif %}
+      {{ optional_text_field(item.created_by_name, default='None') }}
 
       {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
 
diff --git a/tests/app/main/views/test_providers.py b/tests/app/main/views/test_providers.py
index 618f8b557..ded40c2b2 100644
--- a/tests/app/main/views/test_providers.py
+++ b/tests/app/main/views/test_providers.py
@@ -19,11 +19,7 @@ stub_providers = {
             'notification_type': 'sms',
             'updated_at': datetime(2017, 1, 16, 15, 20, 40).isoformat(),
             'version': 1,
-            'created_by': {
-                'email_address': 'test@foo.bar',
-                'name': 'Test User',
-                'id': '7cc1dddb-bcbc-4739-8fc1-61bedde3332a'
-            },
+            'created_by_name': 'Test User',
             'supports_international': False,
             'current_month_billable_sms': 5020,
         },
@@ -50,7 +46,8 @@ stub_providers = {
             'updated_at': None,
             'version': 1,
             'created_by': None,
-            'supports_international': False
+            'supports_international': False,
+            'current_month_billable_sms': 0,
         },
         {
             'active': True,
@@ -62,7 +59,8 @@ stub_providers = {
             'updated_at': None,
             'version': 1,
             'created_by': None,
-            'supports_international': False
+            'supports_international': False,
+            'current_month_billable_sms': 0,
         },
         {
             'id': '67c770f5-918e-4afa-a5ff-880b9beb161d',
@@ -74,7 +72,8 @@ stub_providers = {
             'updated_at': None,
             'version': 1,
             'created_by': None,
-            'supports_international': True
+            'supports_international': True,
+            'current_month_billable_sms': 0,
         },
         {
             'id': '67c770f5-918e-4afa-a5ff-880b9beb161d',
@@ -86,6 +85,7 @@ stub_providers = {
             'updated_at': None,
             'version': 1,
             'created_by': None,
+            'current_month_billable_sms': 0,
         }
     ]
 }
@@ -236,6 +236,7 @@ def test_add_monthly_traffic():
         'current_month_billable_sms': 5,
     }, {
         'identifier': 'loadtesting',
+        'current_month_billable_sms': 0,
     }]
 
     add_monthly_traffic(domestic_sms_providers)
@@ -250,6 +251,7 @@ def test_add_monthly_traffic():
         'monthly_traffic': 16
     }, {
         'identifier': 'loadtesting',
+        'current_month_billable_sms': 0,
         'monthly_traffic': 0
     }]