diff --git a/nymea-app/ui/system/CloudSettingsPage.qml b/nymea-app/ui/system/CloudSettingsPage.qml
index 6ef3f701..3ae6cee2 100644
--- a/nymea-app/ui/system/CloudSettingsPage.qml
+++ b/nymea-app/ui/system/CloudSettingsPage.qml
@@ -111,10 +111,14 @@ Page {
             Layout.fillWidth: true
             Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
             visible: Engine.jsonRpcClient.cloudConnectionState === JsonRpcClient.CloudConnectionStateUnconfigured && !d.deploymentStarted
-            text: qsTr("Register box")
+            text: Engine.awsClient.isLoggedIn ? qsTr("Register box") : qsTr("Log in to cloud")
             onClicked: {
-                d.deploymentStarted = true
-                Engine.deployCertificate();
+                if (Engine.awsClient.isLoggedIn) {
+                    d.deploymentStarted = true
+                    Engine.deployCertificate();
+                } else {
+                    pageStack.push(Qt.resolvedUrl("qrc:/ui/appsettings/CloudLoginPage.qml"))
+                }
             }
         }