diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb
index 1f3f0650db..f3d393bf72 100644
--- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb
+++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb
@@ -245,7 +245,8 @@
             "source": [
                 "from IPython.display import *\n",
                 "connectionParameter = '{\"serverName\":\"localhost,' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
-                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))"
+                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
+                "display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
             ],
             "metadata": {
                 "azdata_cell_guid": "187a0067-a04c-4afb-a684-3103bb4522ae",
diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb
index 031566d2e3..e6f9679c58 100644
--- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb
+++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb
@@ -312,7 +312,8 @@
             "source": [
                 "from IPython.display import *\n",
                 "connectionParameter = '{\"serverName\":\"' + ssh_target + ',' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
-                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))"
+                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
+                "display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
             ],
             "metadata": {
                 "azdata_cell_guid": "187a0067-a04c-4afb-a684-3103bb4522ae",
diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb
index d95b6e2b43..3594b9f533 100644
--- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb
+++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb
@@ -413,6 +413,7 @@
                 "if sqlEndpoints and len(sqlEndpoints) == 1:\n",
                 "    connectionParameter = '{\"serverName\":\"' + sqlEndpoints[0]['endpoint'] + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":' + json.dumps(mssql_username) + ',\"password\":' + json.dumps(mssql_password) + '}'\n",
                 "    display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server Master instance</font></a><br/>'))\n",
+                "    display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))\n",
                 "else:\n",
                 "    sys.exit('Could not find the SQL Server Master instance endpoint.')"
             ],
@@ -426,4 +427,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb
index fd1087f876..80e08d275a 100644
--- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb
+++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb
@@ -312,6 +312,7 @@
                 "if sqlEndpoints and len(sqlEndpoints) == 1:\n",
                 "    connectionParameter = '{\"serverName\":\"' + sqlEndpoints[0]['endpoint'] + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":' + json.dumps(mssql_username) + ',\"password\":' + json.dumps(mssql_password) + '}'\n",
                 "    display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server Master instance</font></a><br/>'))\n",
+                "    display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))\n",
                 "else:\n",
                 "    sys.exit('Could not find the SQL Server Master instance endpoint.')"
             ],
@@ -325,4 +326,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb
index 0934c2bea7..5a2cce6605 100644
--- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb
+++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb
@@ -334,6 +334,7 @@
                 "if sqlEndpoints and len(sqlEndpoints) == 1:\n",
                 "    connectionParameter = '{\"serverName\":\"' + sqlEndpoints[0]['endpoint'] + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":' + json.dumps(mssql_username) + ',\"password\":' + json.dumps(mssql_password) + '}'\n",
                 "    display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server Master instance</font></a><br/>'))\n",
+                "    display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))\n",
                 "else:\n",
                 "    sys.exit('Could not find the SQL Server Master instance endpoint.')"
             ],
@@ -347,4 +348,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb
index c328327abe..1e44676afe 100644
--- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb
+++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb
@@ -318,6 +318,7 @@
                 "if sqlEndpoints and len(sqlEndpoints) == 1:\n",
                 "    connectionParameter = '{\"serverName\":\"' + sqlEndpoints[0]['endpoint'] + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":' + json.dumps(mssql_username) + ',\"password\":' + json.dumps(mssql_password) + '}'\n",
                 "    display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server Master instance</font></a><br/>'))\n",
+                "    display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))\n",
                 "else:\n",
                 "    sys.exit('Could not find the SQL Server Master instance endpoint.')"
             ],
@@ -331,4 +332,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb
index 257d70b19e..2759ac83da 100644
--- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb
+++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb
@@ -336,6 +336,7 @@
                 "if sqlEndpoints and len(sqlEndpoints) == 1:\n",
                 "    connectionParameter = '{\"serverName\":\"' + sqlEndpoints[0]['endpoint'] + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":' + json.dumps(mssql_username) + ',\"password\":' + json.dumps(mssql_password) + '}'\n",
                 "    display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server Master instance</font></a><br/>'))\n",
+                "    display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))\n",
                 "else:\n",
                 "    sys.exit('Could not find the SQL Server Master instance endpoint.')"
             ],
@@ -349,4 +350,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb
index b80f700826..e1c8580ae5 100644
--- a/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb
+++ b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb
@@ -233,7 +233,8 @@
             "source": [
                 "from IPython.display import *\n",
                 "connectionParameter = '{\"serverName\":\"localhost,' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
-                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))"
+                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
+                "display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
             ],
             "metadata": {
                 "azdata_cell_guid": "182517d3-f6d6-4ecc-b2cb-4c21a0f23b4e",
@@ -272,4 +273,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb
index bc8c310a63..ce4c5a065e 100644
--- a/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb
+++ b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb
@@ -232,7 +232,8 @@
             "source": [
                 "from IPython.display import *\n",
                 "connectionParameter = '{\"serverName\":\"localhost,' + sql_port + '\",\"providerName\":\"MSSQL\",\"authenticationType\":\"SqlLogin\",\"userName\":\"sa\",\"password\":' + json.dumps(sql_password) + '}'\n",
-                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))"
+                "display(HTML('<br/><a href=\"command:azdata.connect?' + html.escape(connectionParameter)+'\"><font size=\"3\">Click here to connect to SQL Server</font></a><br/>'))\n",
+                "display(HTML('<br/><span style=\"color:red\"><font size=\"2\">NOTE: The SQL Server password is included in this link, you may want to clear the results of this code cell before saving the notebook.</font></span>'))"
             ],
             "metadata": {
                 "azdata_cell_guid": "4bc64915-c5ae-4507-8fb0-9e413ccc2fd0",
@@ -271,4 +272,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}