diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 48f9dba99f..7c51201caa 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -785,6 +785,18 @@ function captiveportal_passthrumac_configure($lock = false) {
 	return $rules;
 }
 
+function captiveportal_passthrumac_findbyname($username) {
+	global $config;
+
+	if (is_array($config['captiveportal']['passthrumac'])) {
+		foreach ($config['captiveportal']['passthrumac'] as $macent) {
+			if ($macent['username'] == $username)
+				return $macent;
+		}
+	}
+	return NULL;
+}
+
 /* 
  * table (3=IN)/(4=OUT) hold allowed ip's without bw limits
  * table (5=IN)/(6=OUT) hold allowed ip's with bw limit.
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php
index 7c40b855d4..f7aa502249 100755
--- a/usr/local/www/services_captiveportal_mac.php
+++ b/usr/local/www/services_captiveportal_mac.php
@@ -64,8 +64,15 @@ if ($_POST) {
 			clear_subsystem_dirty('passthrumac');
 	}
 
-	if ($_POST['delmac'] && $_POST['postafterlogin']) {
-		if (is_array($a_passthrumacs)) {
+	if ($_POST['postafterlogin']) {
+		if (!is_array($a_passthrumacs))
+			exit;
+		if ($_POST['username']) {
+			$mac = captiveportal_passthrumac_findbyname($_POST['username']);
+			if (!empty($mac))
+				$_POST['delmac'] = $mac['mac'];	
+		}
+		if ($_POST['delmac']) {
 			$found = false;
 			foreach ($a_passthrumacs as $idx => $macent) {
 				if ($macent['mac'] == $_POST['delmac']) {