diff --git a/src/pretix/control/forms/waitinglist.py b/src/pretix/control/forms/waitinglist.py
index fd0198c344..c4e269b0df 100644
--- a/src/pretix/control/forms/waitinglist.py
+++ b/src/pretix/control/forms/waitinglist.py
@@ -19,8 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-from django.db.models import Prefetch
-from django.forms import ChoiceField, EmailField, ValidationError
+from django import forms
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_scopes.forms import SafeModelChoiceField
@@ -35,7 +34,7 @@ from pretix.control.forms.widgets import Select2
 
 
 class WaitingListEntryEditForm(I18nModelForm):
-    itemvar = ChoiceField(
+    itemvar = forms.ChoiceField(
         error_messages={
             'invalid_choice': _("Select a valid choice.")
         }
@@ -116,7 +115,7 @@ class WaitingListEntryEditForm(I18nModelForm):
         cleaned_data = super().clean()
 
         if self.instance.voucher is not None:
-            raise ValidationError(_('A voucher for this waiting list entry was already sent out.'))
+            raise forms.ValidationError(_('A voucher for this waiting list entry was already sent out.'))
 
         itemvar = cleaned_data.get('itemvar')
         if itemvar:
@@ -140,7 +139,7 @@ class WaitingListEntryEditForm(I18nModelForm):
         ]
         field_classes = {
             'subevent': SafeModelChoiceField,
-            'email': EmailField,
+            'email': forms.EmailField,
             'phone': PhoneNumberField,
         }
         widgets = {
diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
index bed99727ca..d4362f9c0e 100644
--- a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
@@ -26,7 +26,7 @@
                 {% trans "Cancel" %}
             </a>
             <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Submit" %}
+                {% trans "Save" %}
             </button>
         </div>
     </form>
diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
index b500f2b274..42c4a90337 100644
--- a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
+++ b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
@@ -270,7 +270,7 @@
                                 </button>
 
                                 <a href="{% url "control:event.orders.waitinglist.edit" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}"
-                                   class="btn btn-default btn-sm" title="{% trans "Edit entry" context "subevent" %}"
+                                   class="btn btn-default btn-sm" title="{% trans "Edit entry" %}"
                                     data-toggle="tooltip">
                                     <i class="fa fa-edit" aria-hidden="true"></i>
                                 </a>