diff --git a/nymea-app/ui/system/UsersSettingsPage.qml b/nymea-app/ui/system/UsersSettingsPage.qml
index 0b52abf9..74f4161f 100644
--- a/nymea-app/ui/system/UsersSettingsPage.qml
+++ b/nymea-app/ui/system/UsersSettingsPage.qml
@@ -42,6 +42,7 @@ SettingsPageBase {
     RowLayout {
         Layout.margins: Style.margins
         spacing: Style.margins
+        visible: !engine.jsonRpcClient.pushButtonAuthAvailable
         ColorIcon {
             size: Style.hugeIconSize
             source: "../images/account.svg"
@@ -70,6 +71,7 @@ SettingsPageBase {
         Layout.fillWidth: true
         text: qsTr("Change password")
         iconName: "../images/key.svg"
+        visible: !engine.jsonRpcClient.pushButtonAuthAvailable
         onClicked: {
             var page = pageStack.push(changePasswordComponent)
             page.confirmed.connect(function(newPassword) {
@@ -83,6 +85,7 @@ SettingsPageBase {
         text: qsTr("Edit user information")
         iconName: "../images/edit.svg"
         onClicked: pageStack.push(editUserInfoComponent)
+        visible: !engine.jsonRpcClient.pushButtonAuthAvailable
     }
 
     NymeaItemDelegate {
@@ -96,13 +99,13 @@ SettingsPageBase {
 
     SettingsPageSectionHeader {
         text: qsTr("Admin")
-        visible: userManager.userInfo.scopes & UserInfo.PermissionScopeAdmin
+        visible: (userManager.userInfo.scopes & UserInfo.PermissionScopeAdmin) && !engine.jsonRpcClient.pushButtonAuthAvailable
     }
 
     NymeaItemDelegate {
         Layout.fillWidth: true
         text: qsTr("Manage users")
-        visible: userManager.userInfo.scopes & UserInfo.PermissionScopeAdmin
+        visible: (userManager.userInfo.scopes & UserInfo.PermissionScopeAdmin) && !engine.jsonRpcClient.pushButtonAuthAvailable
         iconName: "../images/contact-group.svg"
         onClicked: {
             pageStack.push(manageUsersComponent)