diff --git a/src/settings/qobuzsettingspage.cpp b/src/settings/qobuzsettingspage.cpp
index 698690830..ecd8c4429 100644
--- a/src/settings/qobuzsettingspage.cpp
+++ b/src/settings/qobuzsettingspage.cpp
@@ -136,14 +136,14 @@ bool QobuzSettingsPage::eventFilter(QObject *object, QEvent *event) {
 
 void QobuzSettingsPage::LogoutClicked() {
   service_->Logout();
-  ui_->button_login->setEnabled(true);
   ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedOut);
+  ui_->button_login->setEnabled(true);
 }
 
 void QobuzSettingsPage::LoginSuccess() {
   if (!this->isVisible()) return;
   ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn);
-  ui_->button_login->setEnabled(false);
+  ui_->button_login->setEnabled(true);
 }
 
 void QobuzSettingsPage::LoginFailure(QString failure_reason) {
diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp
index 3d9bb21eb..378e2a9f7 100644
--- a/src/settings/tidalsettingspage.cpp
+++ b/src/settings/tidalsettingspage.cpp
@@ -187,10 +187,11 @@ void TidalSettingsPage::LogoutClicked() {
 void TidalSettingsPage::LoginSuccess() {
   if (!this->isVisible()) return;
   ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn);
-  ui_->button_login->setEnabled(false);
+  ui_->button_login->setEnabled(true);
 }
 
 void TidalSettingsPage::LoginFailure(QString failure_reason) {
   if (!this->isVisible()) return;
   QMessageBox::warning(this, tr("Authentication failed"), failure_reason);
+  ui_->button_login->setEnabled(true);
 }