Move Spotify conditions so compiler won't issue warnings
Repair initial login procedure