diff --git a/source/_addons/ssh.markdown b/source/_addons/ssh.markdown
index be32c7993a8..f888cebc6d4 100644
--- a/source/_addons/ssh.markdown
+++ b/source/_addons/ssh.markdown
@@ -10,29 +10,29 @@ footer: true
 featured: true
 ---
 
-Setting up an [SSH](https://openssh.org/) server allows access to your Hass.io folders with any SSH client. It include also a command-line tool to access the  [Hass.io API](https://github.com/home-assistant/hassio/blob/dev/API.md). Try it out:
-
+Setting up an [SSH](https://openssh.org/) server allows access to your Hass.io folders with any SSH client. It include also a cli to access into Hass.IO api. Try it out:
 ```bash
 $ hassio help
 ```
 
-<p class='note'>
-This add-on will not enable you to install packages or do anything as root. This is not allowed with Hass.io.
-</p>
+<p class='note'>This add-on will not enable you to install packages or do anything as root. This is not allowed with Hass.io.</p>
 
-To use this add-on, you must have a private/public key to log in. To generate them, follow the [instructions for Windows][win] and [these for other platforms][other].
+To use this add-on, you must have a private/public key to log in. To generate them, follow the [instructions for Windows][win] and [these for other platforms][other]. It is possible to set a password for login since version 2.0 but for hight security use private/public keys. You can not run both variant at same time.
 
 ```json
 {
   "authorized_keys": [
     "ssh-rsa AKDJD3839...== my-key"
-  ]
+  ],
+  "password": ""
 }
 ```
 
 Configuration variables:
 
-- **authorized_keys** (*Required*): Your public-keys for authorized keyfile. Every element will be a line inside that file.
+- **authorized_keys** (*Optional*): Your public-keys for authorized keyfile. Every element will be a line inside that file.
+- **password** (*Optional*): Set a password for login. We do not recommend this variant.
+
 
 <div class='videoWrapper'>
 <iframe width="560" height="315" src="https://www.youtube.com/embed/GYJTy3UniHc" frameborder="0" allowfullscreen></iframe>
@@ -41,4 +41,4 @@ Configuration variables:
 [win]: https://www.digitalocean.com/community/tutorials/how-to-create-ssh-keys-with-putty-to-connect-to-a-vps
 [other]: https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/
 
-<p class='note'>This add-on is not compatible if Hass.io was installed via the generic Linux installer.</p>
+<p class='note'>This add-on is not compatible when you installed Hass.io via the generic Linux installer.</p>