diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index ca1ae21f43c..bdf04226678 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -11,7 +11,7 @@ footer: true
 
 Home Assistant will create a configuration folder when it is run for the first time. The location of the folder differs between operating systems: on OS X/Linux it's `~/.homeassistant` and on Windows it's `%APPDATA%/.homeassistant`. If you want to use a different folder for configuration, run `hass --config path/to/config`.
 
-Inside your configuration folder is the file `configuration.yaml`. This is the main file that contains which components will be loaded and what their configuration is.  
+Inside your configuration folder is the file `configuration.yaml`. This is the main file that contains which components will be loaded and what their configuration is.
 This file contains YAML code, which is explained briefly in [the configuration troubleshooting page](/getting-started/troubleshooting-configuration/). An example configuration file is located [here](https://github.com/balloob/home-assistant/blob/master/config/configuration.yaml.example).
 
 When launched for the first time, Home Assistant will write a default configuration enabling the web interface and device discovery. It can take up to a minute for your devices to be discovered and show up in the interface.
@@ -19,7 +19,7 @@ When launched for the first time, Home Assistant will write a default configurat
 If you run into trouble while configuring Home Assistant, have a look at [the configuration troubleshooting page](/getting-started/troubleshooting-configuration/).
 
 <p class='note'>
-  You will have to restart Home Assistant for changes in <code>configuration.yaml</code> to take effect.
+You will have to restart Home Assistant for changes in <code>configuration.yaml</code> to take effect.
 </p>
 
 ### {% linkable_title Setting up the basic info %}
@@ -28,7 +28,7 @@ By default Home Assistant will try to detect your location and will automaticall
 
 ```yaml
 homeassistant:
-  # Omitted values in this section will be auto detected using freegeoip.net
+  # Omitted values in this section will be auto detected using freegeoip.io
 
   # Location required to calculate the time the sun rises and sets
   latitude: 32.87336
@@ -47,7 +47,7 @@ homeassistant:
 
 ### {% linkable_title Password protecting the web interface %}
 
-The first thing you want to add is a password for the web interface. Use your favourite text editor to open the file `/config/configuration.yaml` and add the following to the `http` section:
+The first thing you want to add is a password for the web interface. Use your favourite text editor to open the file `configuration.yaml` and add the following to the `http` section:
 
 ```yaml
 http:
@@ -68,4 +68,6 @@ To make Home Assistant accessible while away from home, you will have to setup p
 
 Some Internet service providers will only offer dynamic IPs. This can cause you to be unable to access Home Assistant while away. You can solve this by using a free Dynamic DNS service like [DuckDNS](https://www.duckdns.org/).
 
+You should definitely consider to encrypt your traffic if you are accessing your Home Assistant installation from abroad. For details please check the [Set up encryption using Let's Encrypt](/blog/2015/12/13/setup-encryption-using-lets-encrypt/) blog post.
+
 ### [Next step: Setting up devices &raquo;](/getting-started/devices/)