diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index cb013748c..6f1ae2f29 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -88,7 +88,7 @@ UsersPage::isReady()
     return m_readyFullName &&
            m_readyHostname &&
            m_readyPassword &&
-           m_readyRootPassword &&
+           ( !m_showRootPassword || m_readyRootPassword ) &&
            m_readyUsername;
 }