diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp
index ac6a63fa7..2909f831e 100644
--- a/src/accounts/spotify/SpotifyAccount.cpp
+++ b/src/accounts/spotify/SpotifyAccount.cpp
@@ -374,6 +374,7 @@ SpotifyAccount::resolverMessage( const QString &msgType, const QVariantMap &msg
         setCredentials( creds );
         sync();
 
+        configurationWidget(); // ensure it's created so we can set the login button
         if ( m_configWidget.data() )
         {
             const bool success = msg.value( "success" ).toBool();
diff --git a/src/accounts/spotify/SpotifyAccountConfig.cpp b/src/accounts/spotify/SpotifyAccountConfig.cpp
index fc06ec71e..4cbbf0369 100644
--- a/src/accounts/spotify/SpotifyAccountConfig.cpp
+++ b/src/accounts/spotify/SpotifyAccountConfig.cpp
@@ -134,27 +134,12 @@ SpotifyAccountConfig::doLogin()
     m_playlistsLoading->fadeIn();
 
     emit login( username(), password() );
-
-    /*
-    QVariantMap msg;
-    msg[ "_msgtype" ] = "checkLogin";
-    msg[ "username" ] = username();
-    msg[ "password" ] = password();
-
-    m_account->sendMessage( msg, this, "verifyResult" );
-
-    m_ui->verifyCreds->setText( tr( "Verifying..." ) );
-    m_ui->verifyCreds->setEnabled( false );
-
-    m_resetTimer.start();*/
 }
 
 
 void
 SpotifyAccountConfig::loginResponse( bool success, const QString& msg )
 {
-    m_playlistsLoading->fadeOut();
-
     if ( success )
     {
         m_ui->loginButton->setText( tr( "Logged in!" ) );
@@ -162,6 +147,8 @@ SpotifyAccountConfig::loginResponse( bool success, const QString& msg )
     }
     else
     {
+        setPlaylists( QList< SpotifyPlaylistInfo* >() );
+        m_playlistsLoading->fadeOut();
         m_ui->loginButton->setText( tr( "Failed: %1" ).arg( msg ) );
         m_ui->loginButton->setEnabled( true );
     }
diff --git a/src/accounts/spotify/SpotifyAccountConfig.ui b/src/accounts/spotify/SpotifyAccountConfig.ui
index 3e603368f..95c9ba48e 100644
--- a/src/accounts/spotify/SpotifyAccountConfig.ui
+++ b/src/accounts/spotify/SpotifyAccountConfig.ui
@@ -20,6 +20,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>4</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>