diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 01b401f78..f5687b7ab 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -47,7 +47,7 @@ UsersPage::UsersPage( QWidget* parent )
     , m_readyHostname( false )
     , m_readyPassword( false )
     , m_readyRootPassword( false )
-    , m_showRootPassword( true )
+    , m_writeRootPassword( true )
 {
     ui->setupUi( this );
 
@@ -75,12 +75,13 @@ UsersPage::UsersPage( QWidget* parent )
         ui->labelRootPasswordError->setVisible( !checked );
         ui->textBoxRootPassword->setVisible( !checked );
         ui->textBoxVerifiedRootPassword->setVisible( !checked );
+        checkReady( isReady() );
     } );
 
     m_customUsername = false;
     m_customHostname = false;
 
-    setShowRootPassword( true );
+    setWriteRootPassword( true );
     ui->checkBoxReusePassword->setChecked( true );
 
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
@@ -96,11 +97,14 @@ UsersPage::~UsersPage()
 bool
 UsersPage::isReady()
 {
-    return m_readyFullName &&
-           m_readyHostname &&
-           m_readyPassword &&
-           ( !m_showRootPassword || ( ui->checkBoxReusePassword->isChecked() || m_readyRootPassword ) ) &&
-           m_readyUsername;
+    bool readyFields = m_readyFullName &&
+                       m_readyHostname &&
+                       m_readyPassword &&
+                       m_readyUsername;
+    if ( !m_writeRootPassword || ui->checkBoxReusePassword->isChecked() )
+        return readyFields;
+
+    return readyFields && m_readyRootPassword;
 }
 
 
@@ -124,7 +128,7 @@ UsersPage::createJobs( const QStringList& defaultGroupsList )
                             ui->textBoxUserPassword->text() );
     list.append( Calamares::job_ptr( j ) );
 
-    if ( m_showRootPassword )
+    if ( m_writeRootPassword )
     {
         if ( ui->checkBoxReusePassword->isChecked() )
             j = new SetPasswordJob( "root",
@@ -158,10 +162,10 @@ UsersPage::onActivate()
 
 
 void
-UsersPage::setShowRootPassword( bool show )
+UsersPage::setWriteRootPassword( bool write )
 {
-    ui->checkBoxReusePassword->setVisible( show );
-    m_showRootPassword = show;
+    ui->checkBoxReusePassword->setVisible( write );
+    m_writeRootPassword = write;
 }
 
 
@@ -424,10 +428,12 @@ void
 UsersPage::setAutologinDefault( bool checked )
 {
     ui->checkBoxAutoLogin->setChecked( checked );
+    emit checkReady( isReady() );
 }
 
 void
 UsersPage::setReusePasswordDefault( bool checked )
 {
     ui->checkBoxReusePassword->setChecked( checked );
+    emit checkReady( isReady() );
 }
diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h
index f55ecf1d6..9db88fddf 100644
--- a/src/modules/users/UsersPage.h
+++ b/src/modules/users/UsersPage.h
@@ -44,7 +44,7 @@ public:
 
     void onActivate();
 
-    void setShowRootPassword( bool show );
+    void setWriteRootPassword( bool show );
     void setAutologinDefault( bool checked );
     void setReusePasswordDefault( bool checked );
 
@@ -78,7 +78,7 @@ private:
     bool m_readyPassword;
     bool m_readyRootPassword;
 
-    bool m_showRootPassword;
+    bool m_writeRootPassword;
 };
 
 #endif // USERSPAGE_H
diff --git a/src/modules/users/UsersViewStep.cpp b/src/modules/users/UsersViewStep.cpp
index b0b08d60d..d601014ae 100644
--- a/src/modules/users/UsersViewStep.cpp
+++ b/src/modules/users/UsersViewStep.cpp
@@ -151,7 +151,7 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     {
         Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword",
                         configurationMap.value( "setRootPassword" ).toBool() );
-        m_widget->setShowRootPassword( configurationMap.value( "setRootPassword" ).toBool() );
+        m_widget->setWriteRootPassword( configurationMap.value( "setRootPassword" ).toBool() );
     }
 
     if ( configurationMap.contains( "doAutologin" ) &&