diff --git a/libnymea-app/jsonrpc/jsonrpcclient.cpp b/libnymea-app/jsonrpc/jsonrpcclient.cpp
index 6df4d6ae..eb482c77 100644
--- a/libnymea-app/jsonrpc/jsonrpcclient.cpp
+++ b/libnymea-app/jsonrpc/jsonrpcclient.cpp
@@ -165,6 +165,9 @@ void JsonRpcClient::notificationReceived(const QVariantMap &data)
             settings.beginGroup("jsonTokens");
             settings.setValue(m_serverUuid, m_token);
             settings.endGroup();
+
+            m_initialSetupRequired = false;
+
             emit authenticationRequiredChanged();
 
             setNotificationsEnabled();
diff --git a/nymea-app/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml
index 33f0c8ab..badce5e1 100644
--- a/nymea-app/ui/PushButtonAuthPage.qml
+++ b/nymea-app/ui/PushButtonAuthPage.qml
@@ -46,8 +46,8 @@ Page {
         }
     }
 
-    Component.objectName: {
-        engine.jsonRpcClient.requestPushButtonAuth("");
+    Component.onCompleted: {
+        engine.jsonRpcClient.requestPushButtonAuth("nymea-app (" + PlatformHelper.deviceModel + ")");
     }
 
     Connections {