diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 2485ea1093..9d005330c2 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -107,6 +107,7 @@ define([
         htmlSupport: {
           // Convert all allow/disallow strings to regexp, as config is json only
           allow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || []),
+          allowEmpty: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allowEmpty) || []),
           disallow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
         },
         on: {
diff --git a/lib/configuration.js b/lib/configuration.js
index 03f039d3d8..ce63c7fc7d 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -83,7 +83,10 @@ function Configuration() {
     maxLoginAttempts: 3,
     ckEditorHtmlSupport: {
       allow: [{
-        name: "^(blockquote|ul|ol|span)$"
+        name: "^(a|blockquote|ul|ol|span)$",
+        "attributes": true,
+        "classes": true,
+        "styles": true
       },{
         name: ".*",
         classes: true,
@@ -93,7 +96,11 @@ function Configuration() {
         attributes: {
           target: true
         }
-      }]
+      }],
+      allowEmpty: [
+        "span",
+        "i"
+      ]
     },
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'
diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index ec9764b98c..1c95157c0b 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -80,6 +80,7 @@
         List,
         ListProperties,
         Paragraph,
+        RemoveFormat,
         SelectAll,
         ShowBlocks,
         SourceEditing,
@@ -126,6 +127,7 @@
         List,
         ListProperties,
         Paragraph,
+        RemoveFormat,
         SelectAll,
         ShowBlocks,
         SourceEditing,