diff --git a/tabs/calibration.html b/tabs/calibration.html
index 584a7fe2..9cffa245 100755
--- a/tabs/calibration.html
+++ b/tabs/calibration.html
@@ -64,8 +64,8 @@
                                         <tr>
                                             <td data-i18n="accGain"></td>
                                             <td><label for="accGainX"><span>X</span></label><input type="number" name="accGainX" min="0" max="2000"></td>
-                                            <td><label for="accGainX"><span>Y</span></label><input type="number" name="accGainX" min="0" max="2000"></td>
-                                            <td><label for="accGainX"><span>Z</span></label><input type="number" name="accGainX" min="0" max="2000"></td>
+                                            <td><label for="accGainY"><span>Y</span></label><input type="number" name="accGainY" min="0" max="2000"></td>
+                                            <td><label for="accGainZ"><span>Z</span></label><input type="number" name="accGainZ" min="0" max="2000"></td>
                                         </tr>
                                     </table>
                                 </div>
@@ -154,4 +154,4 @@
         <h1 class="modal__title modal__title--center" data-i18n="accCalibrationProcessing"></h1>
         <div id="modal-compass-countdown" class="modal__text"></div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/tabs/calibration.js b/tabs/calibration.js
index ab753d99..d3b73631 100755
--- a/tabs/calibration.js
+++ b/tabs/calibration.js
@@ -112,7 +112,7 @@ TABS.calibration.initialize = function (callback) {
         var pos = ['X', 'Y', 'Z'];
         pos.forEach(function (item) {
             $('[name=accGain' + item + ']').val(CALIBRATION_DATA.accGain[item]);
-            $('[name=accZero' + item + ']').val(CALIBRATION_DATA.accGain[item]);
+            $('[name=accZero' + item + ']').val(CALIBRATION_DATA.accZero[item]);
             $('[name=Mag' + item + ']').val(CALIBRATION_DATA.magZero[item]);
         });
         updateCalibrationSteps();