diff --git a/src/pretix/control/forms/waitinglist.py b/src/pretix/control/forms/waitinglist.py
index 5da8527497..70a741f9e1 100644
--- a/src/pretix/control/forms/waitinglist.py
+++ b/src/pretix/control/forms/waitinglist.py
@@ -19,7 +19,8 @@
 # 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.forms import ChoiceField, EmailField
+from django.db.models import Q
+from django.forms import ChoiceField, EmailField, ValidationError
 from django.urls import reverse
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -28,7 +29,7 @@ from django_scopes.forms import SafeModelChoiceField
 from phonenumber_field.formfields import PhoneNumberField
 
 from pretix.base.forms import I18nModelForm
-from pretix.base.forms.questions import NamePartsFormField
+from pretix.base.forms.questions import NamePartsFormField, WrappedPhoneNumberPrefixWidget
 from pretix.base.models import Item, ItemVariation, WaitingListEntry
 from pretix.control.forms.widgets import Select2, Select2ItemVarQuota
 
@@ -133,9 +134,5 @@ class WaitingListEntryEditForm(I18nModelForm):
         field_classes = {
             'subevent': SafeModelChoiceField,
             'email': EmailField,
-            'phone': PhoneNumberField,
+            'phone': WrappedPhoneNumberPrefixWidget,
         }
-        exclude = [
-            'voucher',  # handled by the assign operation in the WaitingListActionView
-            'priority'  # handled via thumbs up/down
-        ]
diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
index 7fc03529ab..bed99727ca 100644
--- a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
@@ -6,9 +6,6 @@
     <h1>{% trans "Edit entry" %}</h1>
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
-        <p>{% blocktrans trimmed context "subevent" %}
-            Please make the desired changes to the following waiting list entry: <strong>{{ entry }}</strong>
-        {% endblocktrans %}</p>
 
         {% if form.subevent %}
             {% bootstrap_field form.subevent layout="control" %}
diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
index 15981da392..b500f2b274 100644
--- a/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
+++ b/src/pretix/control/templates/pretixcontrol/waitinglist/index.html
@@ -272,7 +272,7 @@
                                 <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" %}"
                                     data-toggle="tooltip">
-                                    <i class="fa fa-pencil" aria-hidden="true"></i>
+                                    <i class="fa fa-edit" aria-hidden="true"></i>
                                 </a>
 
                                 <a href="{% url "control:event.orders.waitinglist.delete" organizer=request.event.organizer.slug event=request.event.slug entry=e.id %}?next={{ request.get_full_path|urlencode }}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
diff --git a/src/pretix/control/views/waitinglist.py b/src/pretix/control/views/waitinglist.py
index c2fcdcdf6e..cbfd335b5c 100644
--- a/src/pretix/control/views/waitinglist.py
+++ b/src/pretix/control/views/waitinglist.py
@@ -414,7 +414,7 @@ class EntryEdit(EventPermissionRequiredMixin, UpdateView):
     @transaction.atomic
     def form_valid(self, form):
         if form.has_changed():
-            messages.success(self.request, _('The waitinglist entry has been modified.'))
+            messages.success(self.request, _('The waitinglist entry has been changed.'))
             self.object.log_action(
                 'pretix.event.orders.waitinglist.changed', user=self.request.user, data={
                     k: form.cleaned_data.get(k) for k in form.changed_data