diff --git a/management/daemon.py b/management/daemon.py
index 11fe3163..828cdbf8 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -195,7 +195,7 @@ def mail_aliases_add():
 @app.route('/mail/aliases/remove', methods=['POST'])
 @authorized_personnel_only
 def mail_aliases_remove():
-	return remove_mail_alias(request.form.get('source', ''), env)
+	return remove_mail_alias(request.form.get('address', ''), env)
 
 @app.route('/mail/domains')
 @authorized_personnel_only
diff --git a/management/templates/aliases.html b/management/templates/aliases.html
index c0d0ff35..a3dc4c8d 100644
--- a/management/templates/aliases.html
+++ b/management/templates/aliases.html
@@ -216,7 +216,7 @@ function aliases_remove(elem) {
   var row_address = $(elem).parents('tr').attr('data-email');
   show_modal_confirm(
     "Remove Alias",
-    "Remove " + email + "?",
+    "Remove " + row_address + "?",
     "Remove",
     function() {
       api(