diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template
index 73781d55d..b682a1e0a 100644
--- a/apps/common/main/lib/template/AutoCorrectDialog.template
+++ b/apps/common/main/lib/template/AutoCorrectDialog.template
@@ -68,7 +68,8 @@
         </div>
         <div class="padding-large">
             <div class="padding-small" id="id-autocorrect-dialog-chk-quotes"></div>
-            <div id="id-autocorrect-dialog-chk-hyphens"></div>
+            <div class="padding-small" id="id-autocorrect-dialog-chk-hyphens"></div>
+            <div id="id-autocorrect-dialog-chk-hyperlink"></div>
         </div>
         <div class="padding-small">
             <label class="header"><%= scope.textApplyText %></label>
diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js
index c10153856..765dd8f71 100644
--- a/apps/common/main/lib/view/AutoCorrectDialog.js
+++ b/apps/common/main/lib/view/AutoCorrectDialog.js
@@ -113,10 +113,11 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
 
             var $window = this.getChild();
             var me = this;
+            var panelAutoFormat = $window.find('#id-autocorrect-dialog-settings-' + this.appPrefix + 'autoformat');
 
             // Math correct
             this.chReplaceType = new Common.UI.CheckBox({
-                el: $window.findById('#auto-correct-chb-replace-type'),
+                el: $window.find('#auto-correct-chb-replace-type'),
                 labelText: this.textReplaceType,
                 value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-math-correct-replace-type")
             }).on('change', function(field, newValue, oldValue, eOpts){
@@ -197,17 +198,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
             // this.inputBy.cmpEl.find('input').css('font-size', '13px');
 
             this.btnReset = new Common.UI.Button({
-                el: $('#auto-correct-btn-reset')
+                el: $window.find('#auto-correct-btn-reset')
             });
             this.btnReset.on('click', _.bind(this.onResetToDefault, this));
 
             this.btnEdit = new Common.UI.Button({
-                el: $('#auto-correct-btn-edit')
+                el: $window.find('#auto-correct-btn-edit')
             });
             this.btnEdit.on('click', _.bind(this.onEdit, this, false));
 
             this.btnDelete = new Common.UI.Button({
-                el: $('#auto-correct-btn-delete')
+                el: $window.find('#auto-correct-btn-delete')
             });
             this.btnDelete.on('click', _.bind(this.onDelete, this, false));
 
@@ -269,23 +270,23 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
             });
 
             this.btnResetRec = new Common.UI.Button({
-                el: $('#auto-correct-btn-rec-reset')
+                el: $window.find('#auto-correct-btn-rec-reset')
             });
             this.btnResetRec.on('click', _.bind(this.onResetRecToDefault, this));
 
             this.btnAddRec = new Common.UI.Button({
-                el: $('#auto-correct-btn-rec-edit')
+                el: $window.find('#auto-correct-btn-rec-edit')
             });
             this.btnAddRec.on('click', _.bind(this.onAddRec, this, false));
 
             this.btnDeleteRec = new Common.UI.Button({
-                el: $('#auto-correct-btn-rec-delete')
+                el: $window.find('#auto-correct-btn-rec-delete')
             });
             this.btnDeleteRec.on('click', _.bind(this.onDeleteRec, this, false));
 
             if (this.appPrefix=='de-' || this.appPrefix=='pe-') {
                 this.chQuotes = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-quotes'),
+                    el: $window.find('#id-autocorrect-dialog-chk-quotes'),
                     labelText: this.textQuotes,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-smart-quotes")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -295,7 +296,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                     me.api.asc_SetAutoCorrectSmartQuotes(checked);
                 });
                 this.chHyphens = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-hyphens'),
+                    el: $window.find('#id-autocorrect-dialog-chk-hyphens'),
                     labelText: this.textHyphens,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyphens")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -305,7 +306,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                     me.api.asc_SetAutoCorrectHyphensWithDash(checked);
                 });
                 this.chBulleted = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-bulleted'),
+                    el: $window.find('#id-autocorrect-dialog-chk-bulleted'),
                     labelText: this.textBulleted,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-bulleted")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -315,7 +316,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                     me.api.asc_SetAutomaticBulletedLists(checked);
                 });
                 this.chNumbered = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-numbered'),
+                    el: $window.find('#id-autocorrect-dialog-chk-numbered'),
                     labelText: this.textNumbered,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-numbered")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -326,7 +327,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                 });
                 // AutoCorrect
                 this.chFLSentence = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-fl-sentence'),
+                    el: $window.find('#id-autocorrect-dialog-chk-fl-sentence'),
                     labelText: this.textFLSentence,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-sentence")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -339,7 +340,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                 this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false));
             } else if (this.appPrefix=='sse-') {
                 this.chNewRows = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-new-rows'),
+                    el: $window.find('#id-autocorrect-dialog-chk-new-rows'),
                     labelText: this.textNewRowCol,
                     value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-new-rows")
                 }).on('change', function(field, newValue, oldValue, eOpts){
@@ -348,18 +349,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
                     Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-new-rows", checked);
                     me.api.asc_setIncludeNewRowColTable(checked);
                 });
-
-                this.chHyperlink = new Common.UI.CheckBox({
-                    el: $('#id-autocorrect-dialog-chk-hyperlink'),
-                    labelText: this.textHyperlink,
-                    value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyperlink")
-                }).on('change', function(field, newValue, oldValue, eOpts){
-                    var checked = (field.getValue()==='checked');
-                    Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked);
-                    Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked);
-                    me.api.asc_setAutoCorrectHyperlinks(checked);
-                });
             }
+            this.chHyperlink = new Common.UI.CheckBox({
+                el: panelAutoFormat.find('#id-autocorrect-dialog-chk-hyperlink'),
+                labelText: this.textHyperlink,
+                value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyperlink")
+            }).on('change', function(field, newValue, oldValue, eOpts){
+                var checked = (field.getValue()==='checked');
+                Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked);
+                Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked);
+                me.api.asc_setAutoCorrectHyperlinks(checked);
+            });
 
             this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false));
             this.btnsCategory[1].on('click', _.bind(this.onRecCategoryClick, this, false));
@@ -381,9 +381,9 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
             var arr = [
                     this.chReplaceType, this.inputReplace, this.inputBy, this.mathList, this.btnReset, this.btnEdit, this.btnDelete, // 0 tab
                     this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec, // 1 tab
-                    this.chFLSentence // 3 tab
+                    this.chHyperlink // 2 tab
                 ];
-            arr = arr.concat(this.chNewRows ? [this.chHyperlink, this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
+            arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
             arr = arr.concat(this.chFLSentence ? [this.chFLSentence] : []);
             return arr;
         },
@@ -453,7 +453,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
         onAutoformatCategoryClick: function(delay) {
             var me = this;
             _.delay(function(){
-                me.chHyperlink ? me.chHyperlink.focus() : me.chQuotes.focus();
+                (me.appPrefix=='sse-') ? me.chHyperlink.focus() : me.chQuotes.focus();
             },delay ? 50 : 0);
         },
 
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 749392a85..336453b02 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -2605,6 +2605,10 @@ define([
                 value = Common.localStorage.getBool("de-settings-autoformat-fl-sentence", true);
                 Common.Utils.InternalSettings.set("de-settings-autoformat-fl-sentence", value);
                 me.api.asc_SetAutoCorrectFirstLetterOfSentences(value);
+
+                value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true);
+                Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value);
+                // me.api.asc_setAutoCorrectHyperlinks(value);
             },
 
             showRenameUserDialog: function() {
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 2fae5e2bd..d4c486749 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -214,6 +214,7 @@
   "Common.Views.AutoCorrectDialog.textBy": "By",
   "Common.Views.AutoCorrectDialog.textDelete": "Delete",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalize first letter of sentences",
+  "Common.Views.AutoCorrectDialog.textHyperlink": "Internet and network paths with hyperlinks",
   "Common.Views.AutoCorrectDialog.textHyphens": "Hyphens (--) with dash (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
   "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists",
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 7367b8ec4..8bc4b8e07 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -2227,6 +2227,10 @@ define([
                 value = Common.localStorage.getBool("pe-settings-autoformat-fl-sentence", true);
                 Common.Utils.InternalSettings.set("pe-settings-autoformat-fl-sentence", value);
                 me.api.asc_SetAutoCorrectFirstLetterOfSentences(value);
+
+                value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true);
+                Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value);
+                // me.api.asc_setAutoCorrectHyperlinks(value);
             },
 
             showRenameUserDialog: function() {
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 34a6b664c..716f411b2 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -107,6 +107,7 @@
   "Common.Views.AutoCorrectDialog.textBy": "By",
   "Common.Views.AutoCorrectDialog.textDelete": "Delete",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalize first letter of sentences",
+  "Common.Views.AutoCorrectDialog.textHyperlink": "Internet and network paths with hyperlinks",
   "Common.Views.AutoCorrectDialog.textHyphens": "Hyphens (--) with dash (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
   "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists",