diff --git a/docs/autostart/systemd/index.html b/docs/autostart/systemd/index.html
index 3518433490..bf223393b7 100644
--- a/docs/autostart/systemd/index.html
+++ b/docs/autostart/systemd/index.html
@@ -118,6 +118,26 @@ EOF'
+For Ubunt 16.04 use this commands. Notice that files are saved in a slightly diffrent path
+
+$ su -c 'cat <<EOF >> /lib/systemd/system/home-assistant.service
+[Unit]
+Description=Home Assistant
+After=network.target
+
+[Service]
+Type=simple
+User=%i
+ExecStart=/usr/local/bin/hass
+
+[Install]
+WantedBy=multi-user.target
+EOF'
+
+
sudo ln -s /lib/systemd/system/home-assistant.service /etc/systemd/system/home-assistant.service
+
If you’ve setup Home Assistant in virtualenv following our python installation guide or manual installation guide for raspberry pi, the following template should work for you.
[Unit]
diff --git a/docs/installation/virtualenv/index.html b/docs/installation/virtualenv/index.html
index 50ae50ef9f..b53ae68fad 100644
--- a/docs/installation/virtualenv/index.html
+++ b/docs/installation/virtualenv/index.html
@@ -105,11 +105,12 @@
Step 1: Create a Home Assistant user
+ Step 1: Create a Home Assistant user & group
This step is optional, but it’s a good idea to give services like Home Assistant their own user. It gives you more granular control over permissions, and reduces the exposure to the rest of your system in the event there is a security related bug in Home Assistant. This is a reasonably Linux oriented step, and will look different on other operating systems (or even other Linux distributions).
$ sudo adduser --system homeassistant
+$ sudo addgroup homeassistant