diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
index f6150707f..a2ee38741 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
@@ -49,6 +49,19 @@ public class PushFeedbackProcessor extends AccountDatabaseCrawlerListener {
             device.getUninstalledFeedbackTimestamp() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis())
         {
           if (device.getLastSeen() + TimeUnit.DAYS.toMillis(2) <= Util.todayInMillis()) {
+            String type = "unknown";
+            if (!Util.isEmpty(device.getApnId()) && device.getId() == 1) {
+              type = "iPhone";
+            } else if (!Util.isEmpty(device.getApnId()) && device.getId() != 1) {
+              type = "iPad";
+            } else if (!Util.isEmpty(device.getGcmId())) {
+              type = "Android";
+            } else if (device.getFetchesMessages() && "OWA".equals(device.getUserAgent())) {
+              type = "Android Tweaker";
+            } else if (device.getFetchesMessages()) {
+              type = "Desktop";
+            }
+            device.setUserAgent(type);
             device.setGcmId(null);
             device.setApnId(null);
             device.setVoipApnId(null);