diff --git a/op-mode-definitions/generate-system-login-user.xml.in b/op-mode-definitions/generate-system-login-user.xml.in
index bd80840df..6f65c12b3 100755
--- a/op-mode-definitions/generate-system-login-user.xml.in
+++ b/op-mode-definitions/generate-system-login-user.xml.in
@@ -1,90 +1,90 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="generate">
     <children>
       <node name="system">
         <properties>
           <help>Generate system related parameters</help>
         </properties>
         <children>
           <node name="login">
             <properties>
               <help>Generate system login related parameters</help>
             </properties>
             <children>
               <tagNode name="username">
                 <properties>
                   <help>Username used for authentication</help>
                   <completionHelp>
                     <path>system login user</path>
                   </completionHelp>
                 </properties>
                 <children>
                   <node name="otp-key">
                     <properties>
                       <help>Generate OpenConnect OTP token</help>
                     </properties>
                     <children>
                       <node name="hotp-time">
                         <properties>
                           <help>HOTP time-based token</help>
                         </properties>
                         <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5"</command>
                         <children>
                           <tagNode name="rate-limit">
                             <properties>
                               <help>Duration of single time interval</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate-limit "$9"</command>
+                            <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate_limit "$9"</command>
                             <children>
                               <tagNode name="rate-time">
                                 <properties>
                                   <help>The number of digits in the one-time password</help>
                                 </properties>
-                                <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate-limit "$9" --rate-time "${11}" </command>
+                                <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate_limit "$9" --rate_time "${11}" </command>
                                 <children>
                                   <tagNode name="window-size">
                                     <properties>
                                       <help>The number of digits in the one-time password</help>
                                     </properties>
-                                    <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate-limit "$9" --rate-time "${11}" --window-size "${13}"</command>
+                                    <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate_limit "$9" --rate_time "${11}" --window_size "${13}"</command>
                                   </tagNode>
                                 </children>
                               </tagNode>
                             </children>
                           </tagNode>
                           <tagNode name="window-size">
                             <properties>
                               <help>The number of digits in the one-time password</help>
                             </properties>
-                            <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --window-size "${9}"</command>
+                            <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --window_size "${9}"</command>
                             <children>
                               <tagNode name="rate-limit">
                                 <properties>
                                   <help>Duration of single time interval</help>
                                 </properties>
-                                <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate-limit "${11}" --window-size "${9}"</command>
+                                <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate_limit "${11}" --window_size "${9}"</command>
                                 <children>
                                   <tagNode name="rate-time">
                                     <properties>
                                       <help>Duration of single time interval</help>
                                     </properties>
-                                    <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate-limit "${11}" --rate-time "${13}" --window-size "${9}"</command>
+                                    <command>sudo ${vyos_op_scripts_dir}/generate_system_login_user.py --username "$5" --rate_limit "${11}" --rate_time "${13}" --window_size "${9}"</command>
                                   </tagNode>
                                 </children>
                               </tagNode>
                             </children>
                           </tagNode>
                         </children>
                       </node>
                     </children>
                   </node>
                 </children>
               </tagNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>