diff --git a/tabs/initial_setup.css b/tabs/initial_setup.css
index aade3156b6..385061fbc4 100644
--- a/tabs/initial_setup.css
+++ b/tabs/initial_setup.css
@@ -209,7 +209,7 @@
         }
         .tab-initial_setup .throttle dt {
             float: left;
-            width: 65px;
+            width: 70px;
             line-height: 22px;
             
             margin-bottom: 3px;
@@ -217,8 +217,8 @@
         .tab-initial_setup .throttle dd {
             line-height: 22px;
             
-            margin-left: 65px;
-            margin-bottom: 3px;
+            margin-left: 70px;
+            margin-bottom: 4px;
         }
         .tab-initial_setup .throttle input {
             width: 70px;
diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html
index 6ce8076c60..caba159ba6 100644
--- a/tabs/initial_setup.html
+++ b/tabs/initial_setup.html
@@ -58,7 +58,9 @@
         <div class="fields">
             <dl>
                 <dt>Minimum:</dt><dd><input type="number" name="minthrottle" min="0" max="2000" value="0" /></dd>
+                <dt>Maximum:</dt><dd><input type="number" name="maxthrottle" min="0" max="2000" value="0" /></dd>
                 <dt>Failsafe:</dt><dd><input type="number" name="failsafe_throttle" min="1000" max="2000" value="0" /></dd>
+                <dt title="Minimum Command">MinComm.:</dt><dd><input type="number" name="mincommand" min="0" max="2000" value="0" /></dd>
             </dl>
         </div>
     </div>
diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index 4cb8f9631d..a6e247fe41 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -13,7 +13,9 @@ function tab_initialize_initial_setup() {
                 $('input[name="voltagescale"]').val(MISC.vbatscale);
                 
                 $('input[name="minthrottle"]').val(MISC.minthrottle);
+                $('input[name="maxthrottle"]').val(MISC.maxthrottle);
                 $('input[name="failsafe_throttle"]').val(MISC.failsafe_throttle);
+                $('input[name="mincommand"]').val(MISC.mincommand);
                 
                 // Fill in the accel trimms from CONFIG object
                 $('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
@@ -141,7 +143,9 @@ function tab_initialize_initial_setup() {
                     MISC.vbatscale = parseInt($('input[name="voltagescale"]').val());
                     
                     MISC.minthrottle = parseInt($('input[name="minthrottle"]').val());
+                    MISC.maxthrottle = parseInt($('input[name="maxthrottle"]').val());
                     MISC.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
+                    MISC.mincommand = parseInt($('input[name="mincommand"]').val());
                     
                     // we also have to fill the unsupported bytes
                     var buffer_out = new Array();
@@ -149,10 +153,10 @@ function tab_initialize_initial_setup() {
                     buffer_out[1] = 0;
                     buffer_out[2] = lowByte(MISC.minthrottle);
                     buffer_out[3] = highByte(MISC.minthrottle);
-                    buffer_out[4] = 0; // mcfg.maxthrottle, mcfg.mincommand
-                    buffer_out[5] = 0;
-                    buffer_out[6] = 0;
-                    buffer_out[7] = 0;
+                    buffer_out[4] = lowByte(MISC.maxthrottle);
+                    buffer_out[5] = highByte(MISC.maxthrottle);
+                    buffer_out[6] = lowByte(MISC.mincommand);
+                    buffer_out[7] = highByte(MISC.mincommand);
                     buffer_out[8] = lowByte(MISC.failsafe_throttle);
                     buffer_out[9] = highByte(MISC.failsafe_throttle);
                     buffer_out[10] = 0;