diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 781cef325..f3b49335b 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1610,35 +1610,27 @@ ChoicePage::isNextEnabled() const
 bool
 ChoicePage::calculateNextEnabled() const
 {
-    bool enabled = false;
     auto sm_p = m_beforePartitionBarsView ? m_beforePartitionBarsView->selectionModel() : nullptr;
 
     switch ( m_config->installChoice() )
     {
     case InstallChoice::NoChoice:
-        cDebug() << "No partitioning choice";
+        cDebug() << "No partitioning choice has been made yet";
         return false;
     case InstallChoice::Replace:
     case InstallChoice::Alongside:
         if ( !( sm_p && sm_p->currentIndex().isValid() ) )
         {
-            cDebug() << "No partition selected";
+            cDebug() << "No partition selected for alongside or replace";
             return false;
         }
-        enabled = true;
         break;
     case InstallChoice::Erase:
     case InstallChoice::Manual:
-        enabled = true;
+        // Nothing to check for these
+        break;
     }
 
-    if ( !enabled )
-    {
-        cDebug() << "No valid choice made";
-        return false;
-    }
-
-
     if ( m_isEfi
          && ( m_config->installChoice() == InstallChoice::Alongside
               || m_config->installChoice() == InstallChoice::Replace ) )
@@ -1655,7 +1647,7 @@ ChoicePage::calculateNextEnabled() const
         switch ( m_encryptWidget->state() )
         {
         case EncryptWidget::Encryption::Unconfirmed:
-            cDebug() << "No passphrase provided";
+            cDebug() << "No passphrase provided or passphrase mismatch.";
             return false;
         case EncryptWidget::Encryption::Disabled:
         case EncryptWidget::Encryption::Confirmed: