diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index a8fb5a0b..0b39375e 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -283,15 +283,10 @@ Item {
                                 PlatformHelper.requestPermissions();
                             }
                         } else {
-                            var clientId = PlatformHelper.deviceSerial + "+io.guh.nymeaapp";
-                            if ("branding" in app) {
-                                clientId += "-" + app.branding;
-                            }
-
                             AWSClient.registerPushNotificationEndpoint(
                                         PushNotifications.cloudToken,
                                         PlatformHelper.machineHostname,
-                                        clientId,
+                                        PushNotifications.clientId,
                                         PlatformHelper.deviceManufacturer,
                                         PlatformHelper.deviceModel);
                         }
diff --git a/packaging/ios/pushnotifications.mm b/packaging/ios/pushnotifications.mm
index 794595ad..753506e8 100644
--- a/packaging/ios/pushnotifications.mm
+++ b/packaging/ios/pushnotifications.mm
@@ -58,7 +58,7 @@
 //    qDebug() << "Registering for remote notifications";
 //    qDebug() << "Token description:" << QString::fromNSString(deviceToken.description);
 //    qDebug() << "Parsed token:" << QString::fromNSString(tokenStr);
-//    PushNotifications::instance()->setAPNSRegistrationToken(QString::fromNSString(tokenStr));
+    PushNotifications::instance()->setAPNSRegistrationToken(QString::fromNSString(tokenStr));
 }
 
 - (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
@@ -82,7 +82,7 @@
 - (void)tokenRefreshNotification:(NSNotification *)notification {
    NSLog(@"instanceId_notification=>%@",[notification object]);
     NSString *InstanceID = [NSString stringWithFormat:@"%@",[notification object]];
-    qDebug() << "Firebase token:" << QString::fromNSString(InstanceID);
+    qDebug() << "Notifation:" << QString::fromNSString(InstanceID);
 
 }
 
@@ -93,8 +93,8 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:
      @"FCMToken" object:nil userInfo:dataDict];
     // Note: This callback is fired at each app startup and whenever a new token is generated.
-    qDebug() << "Firebase token received:" << QString::fromNSString(fcmToken);
-    PushNotifications::instance()->setAPNSRegistrationToken(QString::fromNSString(fcmToken));
+    //qDebug() << "Firebase token received:" << QString::fromNSString(fcmToken);
+    PushNotifications::instance()->setFirebaseRegistrationToken(QString::fromNSString(fcmToken));
 
 }