diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index aa22fa51e5..7fde014469 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -245,7 +245,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob implements InjectableTy
   }
 
   private List<ContactData> getAllContacts() {
-    List<Address> contactAddresses = DatabaseFactory.getRecipientDatabase(context).getRegistered();
+    List<Address> contactAddresses = new ArrayList<>(DatabaseFactory.getRecipientDatabase(context).getAllAddresses());
     List<ContactData> contacts     = new ArrayList<>(contactAddresses.size());
     for (Address address : contactAddresses) {
       if (!address.isPhone()) { continue; }
diff --git a/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt b/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt
index 0ef7ca67ed..683eea84b6 100644
--- a/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt
@@ -19,7 +19,7 @@ import javax.inject.Inject
 class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters) : BaseJob(parameters), InjectableType {
 
   companion object {
-    const val KEY = "MultiDeviceGroupUpdateJob"
+    const val KEY = "MultiDeviceOpenGroupUpdateJob"
   }
 
   @Inject
@@ -27,7 +27,7 @@ class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters)
 
   constructor() : this(Parameters.Builder()
           .addConstraint(NetworkConstraint.KEY)
-          .setQueue("MultiDeviceGroupUpdateJob")
+          .setQueue("MultiDeviceOpenGroupUpdateJob")
           .setLifespan(TimeUnit.DAYS.toMillis(1))
           .setMaxAttempts(Parameters.UNLIMITED)
           .build())