diff --git a/js/msp.js b/js/msp.js
index e55e3cfc..86b50df3 100755
--- a/js/msp.js
+++ b/js/msp.js
@@ -743,7 +743,7 @@ var MSP = {
                     if (letter != '\0') { 
                         name += letter;
                     }
-                } while (letter != '\0' && offset < 100);
+                } while (letter != '\0');
                 CONFIG.name = name;
                 break;
 
@@ -1507,7 +1507,7 @@ MSP.crunch = function (code) {
             break;
             
         case MSP_codes.MSP_SET_NAME:
-            for (var i = 0; i<32; i++) {
+            for (var i = 0; i<CONFIG.name.length; i++) {
                 buffer.push(CONFIG.name.charCodeAt(i));
             }
             break;
diff --git a/tabs/configuration.html b/tabs/configuration.html
index b90a4f7f..f65029eb 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -491,7 +491,7 @@
                 </div>
                 <div class="spacer_box">
                     <div class="number">
-                        <label> <input type="text" name="vesselName"/> <span
+                        <label> <input type="text" name="vesselName" maxlength="32"/> <span
                             i18n="configurationVesselName"></span>
                         </label>
                     </div>