diff --git a/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt
index e7113268..cd72dc89 100644
--- a/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt
+++ b/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt
@@ -42,14 +42,14 @@ class EditProfileActivity : BaseActivity() {
                     setMessage(getString(R.string.profile_save_changes))
                     setNegativeButton(android.R.string.cancel) { _, _ -> }
                     setPositiveButton(android.R.string.ok) { _, _ ->
-                        this@addCallback.isEnabled = false
-                        super.onBackPressedDispatcher.onBackPressed()
+                        this@addCallback.remove()
+                        onBackPressedDispatcher.onBackPressed()
                     }
                 }.show()
             } else {
-                this.isEnabled = false
+                this@addCallback.remove()
                 if (model.submittedChanges) setResult(RESULT_OK)
-                super.onBackPressedDispatcher.onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
             }
         }
 
diff --git a/app/src/main/res/layout/error_layout.xml b/app/src/main/res/layout/error_layout.xml
index 4d586d48..a411a28f 100644
--- a/app/src/main/res/layout/error_layout.xml
+++ b/app/src/main/res/layout/error_layout.xml
@@ -34,7 +34,7 @@
         app:layout_constraintTop_toBottomOf="@+id/imageView4" />
 
     <TextView
-        android:id="@id/error_text"
+        android:id="@+id/error_text2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/panda_pull_to_refresh_to_try_again"
diff --git a/pixel_common b/pixel_common
index def947b5..c03698e2 160000
--- a/pixel_common
+++ b/pixel_common
@@ -1 +1 @@
-Subproject commit def947b5b1392b3282174bebd0217037f66d0362
+Subproject commit c03698e241de89725c5ded420da696f7961387d4
diff --git a/scrambler b/scrambler
index 23d4d94b..1584ad2a 160000
--- a/scrambler
+++ b/scrambler
@@ -1 +1 @@
-Subproject commit 23d4d94b45a848f0c64a042985eb03d0acc2f18b
+Subproject commit 1584ad2ac65e75a3fa53d71280d04d4ac015d39f