diff --git a/source/getting-started/onboarding.markdown b/source/getting-started/onboarding.markdown
index 81e5c728197..be295c3514f 100644
--- a/source/getting-started/onboarding.markdown
+++ b/source/getting-started/onboarding.markdown
@@ -20,26 +20,34 @@ In this step, you will create the owner account of Home Assistant. This account
 
     ![Set your username and password.](/images/getting-started/username.png)
 
-2. Enter a name for your home and define the location specific settings and the language of the user interface. 
-   - To automatically populate these settings, select **Detect**.
-   - If you'd rather not send your location, you can set these values manually.
+2. Enter a name for your home.
+3. Enter the location of your home.
+   - The location is used to populate settings such as time zone, unit system, and currency.
+   - It is also used for location-based information and automations: for example showing the weather-forecast, opening the shades at sunrise, or starting the vacuum when you leave the home.
+   - If you'd rather not send your location, you can choose a location far away from where you live.
+   - You can always change this information later in the settings.
 
-    ![Define your location specific settings.](/images/getting-started/onboarding_location.png)
+    ![Define your location.](/images/getting-started/onboarding_location.png)
     
-3. Select which information you are willing to share. 
-    - Sharing is disabled by default. However, we would like to encourage you to share some of this data. 
+4. Check if the location based information is correct and change if necessary.
+   - You can always change this information later in the settings.
+
+   ![Define your location specific settings.](/images/getting-started/location_based_settings.png)
+
+5. Select which information you are willing to share.
+    - Sharing is disabled by default. However, we would like to encourage you to share some of this data.
     - This information helps us to find out which platforms we need to support and where to focus our efforts.
-    - The data is anonymized and aggregated. To see the charts we generate out of this data, take a look at our [analytics page](https://analytics.home-assistant.io/). 
+    - The data is anonymized and aggregated. To see the charts we generate out of this data, take a look at our [analytics page](https://analytics.home-assistant.io/).
     
-   ![Share anonymized data](/images/getting-started/onboarding_share_anonymized_info.png) 
+   ![Share anonymized data](/images/getting-started/onboarding_share_anonymized_info.png)
 
-4. Once you are done, select **Next**. 
+6. Once you are done, select **Next**.
     - Home Assistant will then show any {% term devices %} it has discovered on your network.
     - Don't be alarmed if you see fewer items than shown below; you can always manually add devices later.
 
     ![Discovery of devices on your network.](/images/getting-started/onboarding_devices.png)
 
-5. Finally, select **Finish**. 
+7. Finally, select **Finish**.
    - Now you're brought to the Home Assistant web interface. This screen will show all of your devices.
 
-{% include getting-started/next_step.html step="Concepts & Terminologies" link="/getting-started/concepts-terminology/" %}
+{% include getting-started/next_step.html step="Concepts & Terminology" link="/getting-started/concepts-terminology/" %}
diff --git a/source/images/getting-started/location_based_settings.png b/source/images/getting-started/location_based_settings.png
new file mode 100644
index 00000000000..b7ac42c524d
Binary files /dev/null and b/source/images/getting-started/location_based_settings.png differ
diff --git a/source/images/getting-started/onboarding_location.png b/source/images/getting-started/onboarding_location.png
index ebd995e3b70..aaddfe7a430 100644
Binary files a/source/images/getting-started/onboarding_location.png and b/source/images/getting-started/onboarding_location.png differ