diff --git a/apps/common/main/lib/controller/Protection.js b/apps/common/main/lib/controller/Protection.js
index a0e07a6c4..0bde39832 100644
--- a/apps/common/main/lib/controller/Protection.js
+++ b/apps/common/main/lib/controller/Protection.js
@@ -204,13 +204,6 @@ define([
 
             win.show();
 
-            // var props = new AscCommon.asc_CSignatureLine();
-            // props.asc_setSigner1("s1");
-            // props.asc_setSigner2("s2");
-            // props.asc_setEmail('email');
-            // props.asc_setInstructions('instructions');
-            // props.asc_setShowDate(true);
-
             if (guid)
                 win.setSettings(this.api.asc_getSignatureSetup(guid));
         },
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index e30c4778c..58081844e 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -1822,8 +1822,8 @@ define([
             this.viewModeMenu = new Common.UI.Menu({
                 initMenu: function (value) {
                     var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
-                        signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.get_SignatureGuid() : undefined,
-                        signProps = (signGuid) ? me.api.asc_getLineInfo(signGuid) : null,
+                        signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.asc_getSignatureId() : undefined,
+                        signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
                         isInSign = !!signProps && me._canProtect,
                         canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
 
@@ -1840,7 +1840,7 @@ define([
 
                     if (isInSign) {
                         menuSignatureViewSign.cmpEl.attr('data-value', signGuid); // sign
-                        menuSignatureDetails.cmpEl.attr('data-value', signProps.asc_getCertificateId()); // view certificate
+                        menuSignatureDetails.cmpEl.attr('data-value', signProps.asc_getId()); // view certificate
                         menuSignatureViewSetup.cmpEl.attr('data-value', signGuid); // view signature settings
                         menuSignatureRemove.cmpEl.attr('data-value', signGuid);
                     }
@@ -2267,7 +2267,7 @@ define([
                     menuImgCut.setDisabled(islocked || !cancopy);
                     menuImgPaste.setDisabled(islocked);
 
-                    var signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.get_SignatureGuid() : undefined,
+                    var signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         isInSign = (signGuid !== undefined);
                     menuSignatureEditSign.setVisible(isInSign);
                     menuSignatureEditSetup.setVisible(isInSign);
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index 8cbd59ab0..bdb29ff9c 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1298,7 +1298,7 @@ define([
                             isimagemenu = true;
                         }
                         if (this.permissions.canProtect)
-                            signGuid = elValue.get_SignatureGuid();
+                            signGuid = elValue.asc_getSignatureId();
                     }
                 }
 
@@ -1523,12 +1523,12 @@ define([
                 var selectedObjects = this.api.asc_getGraphicObjectProps();
                 for (var i = 0; i < selectedObjects.length; i++) {
                     if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
-                        signGuid = selectedObjects[i].asc_getObjectValue().get_SignatureGuid();
+                        signGuid = selectedObjects[i].asc_getObjectValue().asc_getSignatureId();
                     }
                 }
             }
 
-            var signProps = (signGuid) ? this.api.asc_getLineInfo(signGuid) : null,
+            var signProps = (signGuid) ? this.api.asc_getSignatureSetup(signGuid) : null,
                 isInSign = !!signProps && this._canProtect,
                 canComment = iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments && !this._isDisabled;
 
@@ -1545,7 +1545,7 @@ define([
 
             if (isInSign) {
                 documentHolder.menuSignatureViewSign.cmpEl.attr('data-value', signGuid); // sign
-                documentHolder.menuSignatureDetails.cmpEl.attr('data-value', signProps.asc_getCertificateId()); // view certificate
+                documentHolder.menuSignatureDetails.cmpEl.attr('data-value', signProps.asc_getId()); // view certificate
                 documentHolder.menuSignatureViewSetup.cmpEl.attr('data-value', signGuid); // view signature settings
                 documentHolder.menuSignatureRemove.cmpEl.attr('data-value', signGuid);
             }