diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index 2fdd4c047..2d0edcee1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -23,6 +23,7 @@ import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureExcept
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
 
 public class RefreshAttributesJob extends BaseJob {
 
@@ -49,6 +50,8 @@ public class RefreshAttributesJob extends BaseJob {
                            .addConstraint(NetworkConstraint.KEY)
                            .setQueue("RefreshAttributesJob")
                            .setMaxInstancesForFactory(2)
+                           .setLifespan(TimeUnit.DAYS.toDays(30))
+                           .setMaxAttempts(Parameters.UNLIMITED)
                            .build(),
          forced);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
index 0323db41f..4bd5c8789 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
@@ -120,6 +120,14 @@ public class RefreshOwnProfileJob extends BaseJob {
         Util.isEmpty(profile.getAboutEmoji()))
     {
       Log.w(TAG, "The profile we retrieved was empty! Ignoring it.");
+
+      if (!self.getProfileName().isEmpty()) {
+        Log.w(TAG, "We have a name locally. Scheduling a profile upload.");
+        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+      } else {
+        Log.w(TAG, "We don't have a name locally, either!");
+      }
+
       return;
     }
 
diff --git a/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt b/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
index 14a42a15c..1a34f622c 100644
--- a/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
+++ b/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
@@ -2,7 +2,6 @@ package org.signal.qr
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.util.Size
 import android.widget.FrameLayout
 import androidx.annotation.RequiresApi
 import androidx.camera.core.AspectRatio