diff --git a/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp
index 310ac2b..574b058 100644
--- a/user_channel/channel_mgmt.cpp
+++ b/user_channel/channel_mgmt.cpp
@@ -487,10 +487,12 @@
         return IPMI_CC_ACTION_NOT_SUPPORTED_FOR_CHANNEL;
     }
 
-    if ((setFlag & setAccessMode) &&
-        (!isValidAccessMode(chAccessData.accessMode)))
+    if (((setFlag & setAccessMode) &&
+         (!isValidAccessMode(chAccessData.accessMode))) ||
+        ((setFlag & setPrivLimit) &&
+         (!isValidPrivLimit(chAccessData.privLimit))))
     {
-        log<level::DEBUG>("Invalid access mode specified");
+        log<level::DEBUG>("Invalid access mode / privilege limit specified");
         return IPMI_CC_INVALID_FIELD_REQUEST;
     }
 
@@ -582,10 +584,12 @@
         return IPMI_CC_ACTION_NOT_SUPPORTED_FOR_CHANNEL;
     }
 
-    if ((setFlag & setAccessMode) &&
-        (!isValidAccessMode(chAccessData.accessMode)))
+    if (((setFlag & setAccessMode) &&
+         (!isValidAccessMode(chAccessData.accessMode))) ||
+        ((setFlag & setPrivLimit) &&
+         (!isValidPrivLimit(chAccessData.privLimit))))
     {
-        log<level::DEBUG>("Invalid access mode specified");
+        log<level::DEBUG>("Invalid access mode / privilege limit specified");
         return IPMI_CC_INVALID_FIELD_REQUEST;
     }