diff --git a/source/_addons/ssh.markdown b/source/_addons/ssh.markdown
index dae2c308b46..2ee90db5850 100644
--- a/source/_addons/ssh.markdown
+++ b/source/_addons/ssh.markdown
@@ -2,7 +2,7 @@
 layout: page
 title: "SSH Server"
 description: "Allow logging in remotely to Hass.io using SSH."
-date: 2017-04-30 13:28
+date: 2017-11-03 22:25
 sidebar: true
 comments: false
 sharing: true
@@ -22,7 +22,7 @@ This add-on will not enable you to install packages or do anything as root. This
 
 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 high security use private/public keys. You can not run both variant at same time.
 
-In order to start this add-on for the first time, you either need to include an ssh key (enclosed in quotation marks) or set a password in the options section. 
+In order to start this add-on for the first time, you either need to include an ssh key (enclosed in quotation marks, on a single line without line breaks) or set a password in the options section. 
 
 ```json
 {
@@ -33,11 +33,13 @@ In order to start this add-on for the first time, you either need to include an
 }
 ```
 
-The username for login over ssh is `root`.
+The username for login over ssh is `root`. The complete login command is `ssh root@hassio.local`.
+
+After logging in, you will find yourself in this add-ons container. The Home Assistant configuration directory is mounted on the path `/config`.
 
 Configuration variables:
 
-- **authorized_keys** (*Optional*): 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.