diff --git a/InvenTree/company/migrations/0024_unique_name_email_constraint.py b/InvenTree/company/migrations/0024_unique_name_email_constraint.py
new file mode 100644
index 0000000000..3a8781f98d
--- /dev/null
+++ b/InvenTree/company/migrations/0024_unique_name_email_constraint.py
@@ -0,0 +1,38 @@
+from django.db import migrations, models
+
+
+def make_empty_email_field_null(apps, schema_editor):
+    Company = apps.get_model('company', 'Company')
+    for company in Company.objects.all():
+        if company.email == '':
+            company.email = None
+            company.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0023_auto_20200808_0715'),
+    ]
+
+    operations = [
+        # Allow email field to be NULL
+        migrations.AlterField(
+            model_name='company',
+            name='email',
+            field=models.EmailField(blank=True, help_text='Contact email address', max_length=254, null=True, unique=False, verbose_name='Email'),
+        ),
+        # Convert empty email string to NULL
+        migrations.RunPython(make_empty_email_field_null),
+        # Remove unique constraint on name field
+        migrations.AlterField(
+            model_name='company',
+            name='name',
+            field=models.CharField(help_text='Company name', max_length=100, verbose_name='Company name'),
+        ),
+        # Add unique constraint on name/email pair
+        migrations.AddConstraint(
+            model_name='company',
+            constraint=models.UniqueConstraint(fields=('name', 'email'), name='unique_name_email_pair'),
+        ),
+    ]
diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index f1e249fd58..b9fed2ee7b 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -12,7 +12,7 @@ import math
 from django.utils.translation import gettext_lazy as _
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.db.models import Sum, Q
+from django.db.models import Sum, Q, UniqueConstraint
 
 from django.apps import apps
 from django.urls import reverse
@@ -81,8 +81,11 @@ class Company(models.Model):
 
     class Meta:
         ordering = ['name', ]
+        constraints = [
+            UniqueConstraint(fields=['name', 'email'], name='unique_name_email_pair')
+        ]
 
-    name = models.CharField(max_length=100, blank=False, unique=True,
+    name = models.CharField(max_length=100, blank=False,
                             help_text=_('Company name'),
                             verbose_name=_('Company name'))
 
@@ -98,7 +101,8 @@ class Company(models.Model):
                              verbose_name=_('Phone number'),
                              blank=True, help_text=_('Contact phone number'))
 
-    email = models.EmailField(blank=True, verbose_name=_('Email'), help_text=_('Contact email address'))
+    email = models.EmailField(blank=True, null=True,
+                              verbose_name=_('Email'), help_text=_('Contact email address'))
 
     contact = models.CharField(max_length=100,
                                verbose_name=_('Contact'),