diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
index 54efd4deb..8c5a1e83b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
@@ -351,6 +351,7 @@ public class AccountController {
     Device  device  = account.getAuthenticatedDevice().get();
     device.setGcmId(null);
     device.setFetchesMessages(false);
+    device.setUserAgent("OWA");
 
     accounts.update(account);
     directoryQueue.refreshRegisteredUser(account);
@@ -384,6 +385,11 @@ public class AccountController {
     Device  device  = account.getAuthenticatedDevice().get();
     device.setApnId(null);
     device.setFetchesMessages(false);
+    if (device.getId() == 1) {
+      device.setUserAgent("OWI");
+    } else {
+      device.setUserAgent("OWP");
+    }
 
     accounts.update(account);
     directoryQueue.refreshRegisteredUser(account);
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 a2ee38741..e797bb088 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/PushFeedbackProcessor.java
@@ -49,19 +49,15 @@ 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";
+            if (!Util.isEmpty(device.getApnId())) {
+              if (device.getId() == 1) {
+                device.setUserAgent("OWI");
+              } else {
+                device.setUserAgent("OWP");
+              }
             } 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("OWA");
             }
-            device.setUserAgent(type);
             device.setGcmId(null);
             device.setApnId(null);
             device.setVoipApnId(null);