diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index e1a16fb0b..859693da8 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -422,6 +422,7 @@ define(function () {
     // Settings
     out.settings_cat_account = "Account";
     out.settings_cat_drive = "CryptDrive";
+    out.settings_cat_code = "Code";
     out.settings_title = "Settings";
     out.settings_save = "Save";
 
@@ -468,6 +469,9 @@ define(function () {
     out.settings_logoutEverywhere = "Force log out of all other web sessions";
     out.settings_logoutEverywhereConfirm = "Are you sure? You will need to log in with all your devices.";
 
+    out.settings_codeIndentation = 'Code editor indentation (spaces)';
+    out.settings_codeUseTabs = "Indent using tabs (instead of spaces)";
+
     out.upload_title = "File upload";
     out.upload_serverError = "Server Error: unable to upload your file at this time.";
     out.upload_uploadPending = "You already have an upload in progress. Cancel it and upload your new file?";
diff --git a/www/settings/main.js b/www/settings/main.js
index 24db12a81..24978bf50 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -39,7 +39,6 @@ define([
         'account': [
             'infoBlock',
             'displayName',
-            'indentUnit',
             'languageSelector',
             'logoutEverywhere',
             'resetTips',
@@ -49,6 +48,9 @@ define([
             'backupDrive',
             'importLocalPads',
             'resetDrive'
+        ],
+        'code': [
+            'indentUnit',
         ]
     };
 
@@ -129,10 +131,10 @@ define([
     var createIndentUnitSelector = function (obj) {
         var proxy = obj.proxy;
 
-        console.log('create indent unit selector');
         var $div = $('<div>', {
             'class': 'indentUnit element'
         });
+        $('<label>').text(Messages.settings_codeIndentation).appendTo($div);
 
         var $inputBlock = $('<div>', {
             'class': 'inputBlock',
@@ -144,7 +146,6 @@ define([
             type: 'number',
         }).on('change', function () {
             var val = parseInt($input.val());
-            console.log(val, typeof(val));
             if (typeof(val) !== 'number') { return; }
             proxy['cryptpad.indentUnit'] = val;
         }).appendTo($inputBlock);
@@ -380,6 +381,7 @@ define([
             var $category = $('<div>', {'class': 'category'}).appendTo($categories);
             if (key === 'account') { $category.append($('<span>', {'class': 'fa fa-user-o'})); }
             if (key === 'drive') { $category.append($('<span>', {'class': 'fa fa-hdd-o'})); }
+            if (key === 'code') { $category.append($('<span>', {'class': 'fa fa-file-code-o' })); }
 
             if (key === active) {
                 $category.addClass('active');