diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index dbf2a4c87..7ae3f142e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -151,6 +151,11 @@ class TaskFormActivity : BaseActivity() {
 
     private var isDiscardCancelled: Boolean = false
     private var canSave: Boolean = false
+        set(value) {
+            if (field == value) return
+            field = value
+            invalidateOptionsMenu()
+        }
 
     private var tintColor: Int = 0
         set(value) {
@@ -449,9 +454,6 @@ class TaskFormActivity : BaseActivity() {
 
     private fun checkCanSave() {
         val newCanSave = binding.textEditText.text?.isNotBlank() == true
-        if (newCanSave != canSave) {
-            invalidateOptionsMenu()
-        }
         canSave = newCanSave
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 5b14c75bc..33a3ea120 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -422,7 +422,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 rightText = "-" + priceLabel.text
             )
             inventoryRepository.retrieveInAppRewards()
-            userRepository.retrieveUser()
+            userRepository.retrieveUser(forced = true)
             if (item.isTypeGear || item.currency == "hourglasses") {
                 onGearPurchased?.invoke(item)
             }