3 files changed, 6 insertions, 7 deletions

diff --git a/_ont/ont-cig-g-97cp.md b/_ont/ont-cig-g-97cp.md
index cc280b6..d6169ad 100644
--- a/_ont/ont-cig-g-97cp.md
+++ b/_ont/ont-cig-g-97cp.md
@@ -28,13 +28,9 @@ parent: CIG
 {% include image.html file="cig/cig-1.jpg" alt="CIG G-97CP Unidata" caption="CIG G-97CP Unidata <a href='https://forum.fibra.click/u/papin'>@papin</a>" %} 
 {% include image.html file="cig/cig-2.jpg" alt="CIG G-97CP Unidata" caption="CIG G-97CP Unidata <a href='https://forum.fibra.click/u/papin'>@papin</a>" %}
 
-## Enable password
+{% include_relative ont-nokia-use.md username="ont" alertEnablePassword="The following enable password is used to enter GponCLI via serial connection in in firmware where it is not disabled." %}
 
-{% include alert.html content="The following enable password is used to enter GponCLI via Serial and SSH in Unidata's models." alert="Note" icon="svg-info" color="blue" %}
-
-You can use this tool to generate the enable password:
-
-{% include cig_password.html username="ont" %}
+{% include_relative ont-nokia-useful-command.md %}
 
 # Note
 
diff --git a/_ont/ont-nokia-use.md b/_ont/ont-nokia-use.md
index d78c00f..d237d3e 100644
--- a/_ont/ont-nokia-use.md
+++ b/_ont/ont-nokia-use.md
@@ -1,4 +1,5 @@
 # Usage
+{% if !include.disableEnablePassword %}
 ## Login and enable
 
 {% if include.alertEnablePassword  %}
@@ -18,6 +19,8 @@ The enable password can be generated using the following form:
 
 {% include cig_password.html username=include.username %}
 
+{% endif %}
+
 # Accessing Full Shell
 
 To access a complete linux shell just type:
diff --git a/_ont/ont-zte-f6005.md b/_ont/ont-zte-f6005.md
index 5dad78c..1e10e08 100644
--- a/_ont/ont-zte-f6005.md
+++ b/_ont/ont-zte-f6005.md
@@ -45,7 +45,7 @@ The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be acc
 - V6.0.10P2N18 (OpenFiber)
 - V6.0.10P2N19 (OpenFiber)
 
-{% include_relative ont-nokia-use.md username="ont" alertEnablePassword="The following enable password is used to enter GponCLI over a serial connection. The models currently distributed in Italy by TIM and OpenFiber have no way to enter GponCLI via serial, only via telnet after flashing a custom firmware. The enable password is not useful for accessing the Web Gui." %}
+{% include_relative ont-nokia-use.md disableEnablePassword %}
 
 {% include_relative ont-nokia-useful-command.md %}