diff --git a/tcms/testplans/forms.py b/tcms/testplans/forms.py
index a296840bad..b8207d6153 100644
--- a/tcms/testplans/forms.py
+++ b/tcms/testplans/forms.py
@@ -3,8 +3,8 @@
 
 from tcms.core.widgets import SimpleMDE
 from tcms.core.utils import string_to_list
-from tcms.core.forms.fields import UserField, StripURLField
-from tcms.management.models import Product, Version, Tag
+from tcms.core.forms.fields import StripURLField
+from tcms.management.models import Product, Version
 from .models import TestPlan, PlanType
 
 
@@ -58,6 +58,7 @@ def populate(self, product_id):
 
 
 class NewPlanForm(BasePlanForm):
+
     auto_to_plan_author = forms.BooleanField(
         initial=True,
         required=False
@@ -81,10 +82,6 @@ class NewPlanForm(BasePlanForm):
     is_active = forms.BooleanField(required=False, initial=True)
 
 
-class EditPlanForm(NewPlanForm):
-    author = UserField(required=False)
-
-
 # =========== Forms for search/filter ==============
 
 class SearchPlanForm(forms.Form):
@@ -191,11 +188,11 @@ class ClonePlanForm(BasePlanForm):
 # =========== Forms for XML-RPC functions ==============
 
 
-class XMLRPCNewPlanForm(EditPlanForm):
+class XMLRPCNewPlanForm(NewPlanForm):
     text = forms.CharField()
 
 
-class XMLRPCEditPlanForm(EditPlanForm):
+class XMLRPCEditPlanForm(NewPlanForm):
     name = forms.CharField(
         label="Plan name", required=False
     )
diff --git a/tcms/testplans/views.py b/tcms/testplans/views.py
index 487feab680..e239445556 100644
--- a/tcms/testplans/views.py
+++ b/tcms/testplans/views.py
@@ -27,7 +27,6 @@
 from tcms.testcases.views import get_selected_testcases
 from tcms.testcases.views import printable as testcases_printable
 from tcms.testplans.forms import ClonePlanForm
-from tcms.testplans.forms import EditPlanForm
 from tcms.testplans.forms import NewPlanForm
 from tcms.testplans.forms import SearchPlanForm
 from tcms.testplans.models import TestPlan, PlanType
@@ -287,7 +286,7 @@ def edit(request, plan_id):
 
     # If the form is submitted
     if request.method == "POST":
-        form = EditPlanForm(request.POST)
+        form = NewPlanForm(request.POST)
         form.populate(product_id=request.POST.get('product'))
 
         # FIXME: Error handle
@@ -313,7 +312,7 @@ def edit(request, plan_id):
             return HttpResponseRedirect(
                 reverse('test_plan_url', args=[plan_id, slugify(test_plan.name)]))
     else:
-        form = EditPlanForm(initial={
+        form = NewPlanForm(initial={
             'name': test_plan.name,
             'product': test_plan.product_id,
             'product_version': test_plan.product_version_id,