diff --git a/bin/plugin/group-owner/groupModify.json b/bin/plugin/group-owner/groupModify.json
index 7ab2e999f..c66cd4da0 100644
--- a/bin/plugin/group-owner/groupModify.json
+++ b/bin/plugin/group-owner/groupModify.json
@@ -1,12 +1,12 @@
 {
     "interactive": [
-        "groupModify"                                        , {"ac" : ["--group"]},
-        "groupModify +--group"                               , {"ac" : ["<GROUP>"]},
-        "groupModify +--group +\\S+"                         , {"ac" : ["--mfa-required","--guest-ttl-limit"]},
-        "groupModify +--group +\\S+ +--mfa-required"         , {"ac" : ["password","totp","any","none"]},
-        "groupModify +--group +\\S+ +--mfa-required +\\S+"   , {"pr" : ["<ENTER>"]},
-        "groupModify +--group +\\S+ +--guest-ttl-limit"      , {"pr" : ["<DURATION>"]},
-        "groupModify +--group +\\S+ +--guest-ttl-limit +\\S+", {"pr" : ["<ENTER>"]}
+        "groupModify"                                 , {"ac" : ["--group"]},
+        "groupModify +--group"                        , {"ac" : ["<GROUP>"]},
+        "groupModify +--group +.+--mfa-required"      , {"ac" : ["password","totp","any","none"]},
+        "groupModify +--group +.+--guest-ttl-limit"   , {"pr" : ["<DURATION>"]},
+        "groupModify +--group +.+--idle-lock-timeout" , {"pr" : ["<DURATION>","0 (disable)","-1 (use bastion default)"]},
+        "groupModify +--group +.+--idle-kill-timeout" , {"pr" : ["<DURATION>","0 (disable)","-1 (use bastion default)"]},
+        "groupModify +--group +.+"                    , {"ac" : ["--mfa-required","--guest-ttl-limit","--idle-lock-timeout","--idle-kill-timeout","<ENTER>"]}
     ],
     "master_only": 1
 }
diff --git a/bin/plugin/restricted/accountModify.json b/bin/plugin/restricted/accountModify.json
index d4becc03c..34527a917 100644
--- a/bin/plugin/restricted/accountModify.json
+++ b/bin/plugin/restricted/accountModify.json
@@ -3,11 +3,11 @@
     "interactive": [
         "accountModify"                                                                                                             , {"ac": ["--account"]},
         "accountModify +--account"                                                                                                  , {"ac": ["<ACCOUNT>"]},
-        "accountModify +--account +\\S+"                                                                                            , {"ac": ["--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional"]},
         "accountModify +--account +\\S+ +.*(--mfa-password-required|--mfa-totp-required)"                                           , {"ac": ["yes","no","bypass"]},
         "accountModify +--account +\\S+ +.*(--pam-auth-bypass|--mfa-auth-bypass|--always-active|idle-ignore|--pubkey-auth-optional)", {"ac": ["yes","no"]},
         "accountModify +--account +\\S+ +.*(--egress-strict-host-key-checking)"                                                     , {"ac": ["yes","accept-new","no","ask","default","bypass"]},
         "accountModify +--account +\\S+ +.*(--personal-egress-mfa-required)"                                                        , {"ac": ["password","totp","any","none"]},
-        "accountModify +--account +\\S+ +.*(yes|accept-new|no|bypass|ask|default|totp|password|none)"                               , {"ac": ["--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional","<enter>"]}
+        "accountModify +--account +\\S+ +.*(--max-inactive-days)"                                                                   , {"pr": ["<NUMBER_OF_DAYS>"]},
+        "accountModify +--account +\\S+ +.*"                                                                                        , {"ac": ["<ENTER>","--mfa-password-required","--mfa-totp-required","--pam-auth-bypass","--always-active","--egress-strict-host-key-checking","--personal-egress-mfa-required","--idle-ignore","--pubkey-auth-optional","--max-inactive-days","--osh-only"]}
     ]
 }