diff --git a/common/djangoapps/entitlements/admin.py b/common/djangoapps/entitlements/admin.py
index 2767f729fe..db853806e1 100644
--- a/common/djangoapps/entitlements/admin.py
+++ b/common/djangoapps/entitlements/admin.py
@@ -65,6 +65,18 @@ class CourseEntitlementSupportDetailAdmin(admin.ModelAdmin):
     form = CourseEntitlementSupportDetailForm
 
 
+class CourseEntitlementPolicyForm(forms.ModelForm):
+    """ Form for creating custom course entitlement policies. """
+    def __init__(self, *args, **kwargs):
+        super(CourseEntitlementPolicyForm, self).__init__(*args, **kwargs)
+        self.fields['site'].required = False
+        self.fields['mode'].required = False
+
+    class Meta:
+        fields = '__all__'
+        model = CourseEntitlementPolicy
+
+
 @admin.register(CourseEntitlementPolicy)
 class CourseEntitlementPolicyAdmin(admin.ModelAdmin):
     """
@@ -75,3 +87,4 @@ class CourseEntitlementPolicyAdmin(admin.ModelAdmin):
                     'regain_period',
                     'mode',
                     'site')
+    form = CourseEntitlementPolicyForm