diff --git a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
index 6db25631b4..b7b0b98dba 100644
--- a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
+++ b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
@@ -125,14 +125,18 @@ return network.registerProtocol('modemmanager', {
 		o.depends('allowedmode','5g|4g|3g|2g');
 
 		o = s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
-		o.depends('auth', 'pap');
-		o.depends('auth', 'chap');
-		o.depends('auth', 'both');
+		o.depends({'allowedauth': 'pap', '!contains': true });
+		o.depends({'allowedauth': 'chap', '!contains': true });
+		o.depends({'allowedauth': 'mschap', '!contains': true });
+		o.depends({'allowedauth': 'mschapv2', '!contains': true });
+		o.depends({'allowedauth': 'eap', '!contains': true });
 
 		o = s.taboption('general', form.Value, 'password', _('PAP/CHAP password'));
-		o.depends('auth', 'pap');
-		o.depends('auth', 'chap');
-		o.depends('auth', 'both');
+		o.depends({'allowedauth': 'pap', '!contains': true });
+		o.depends({'allowedauth': 'chap', '!contains': true });
+		o.depends({'allowedauth': 'mschap', '!contains': true });
+		o.depends({'allowedauth': 'mschapv2', '!contains': true });
+		o.depends({'allowedauth': 'eap', '!contains': true });
 		o.password = true;
 
 		o = s.taboption('general', form.ListValue, 'iptype', _('IP Type'));