From edf5d98bb16589a50a82af7436a5068564f1aaa3 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Fri, 28 Jan 2022 20:30:02 +0100
Subject: [PATCH] Mention account linking is the default for Spotify (#21371)

---
 source/_integrations/spotify.markdown | 29 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/source/_integrations/spotify.markdown b/source/_integrations/spotify.markdown
index 99361354f57..9c03cea9f6c 100644
--- a/source/_integrations/spotify.markdown
+++ b/source/_integrations/spotify.markdown
@@ -20,13 +20,29 @@ The Spotify media player integration allows you to control [Spotify](https://www
 ## Prerequisites
 
 - Spotify account
-- Spotify application configured for Home Assistant (see [below](#create-a-spotify-application))
+- (Optional) Spotify developer application configured for Home Assistant (see [below](#create-a-spotify-application))
 
 <div class='note'>
   Spotify integrated media controls (pause, play, next, etc.) require a Premium account.
   If you do not have a Premium account, the frontend will not show the controls.
 </div>
 
+{% include integrations/config_flow.md %}
+
+Unless configured otherwise, Home Assistant will use account linking provided by
+Nabu Casa for authenticating with Spotify. If this is not working or you don't
+want to use it, follow the steps for configuring a [developer appliaction](#create-a-spotify-application)
+before configuring Spotify.
+
+<div class='note'>
+
+  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to
+  authenticate with your Spotify account, check the Redirect URI in
+  the address bar after adding the new integration. Compare this value with the
+  Redirect URI defined in the Spotify Developer Portal.
+
+</div>
+
 ### Create a Spotify application
 
 - Login to [Spotify Developer](https://developer.spotify.com) via Dashboard.
@@ -67,17 +83,6 @@ client_secret:
 
 Restart your Home Assistant instance before continuing with the next step.
 
-{% include integrations/config_flow.md %}
-
-<div class='note'>
-
-  If you receive an `INVALID_CLIENT: Invalid redirect URI` error while trying to
-  authenticate with your Spotify account, check the Redirect URI in
-  the address bar after adding the new integration. Compare this value with the
-  Redirect URI defined in the Spotify Developer Portal.
-
-</div>
-
 ## Using multiple Spotify accounts
 
 This integration supports multiple Spotify accounts at once. You don't need to