diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 6605314a8..576615ad2 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -318,7 +318,7 @@
     <string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
     <string name="open_in_store">Open Play Store</string>
     <string name="change_class_confirmation">Do you want to change class for 3 Gems?</string>
-    <string name="change_class_selected_confirmation">Do you want to change your class to %1$s for 3 Gems?</string>
+    <string name="change_class_selected_confirmation">Do you want to change your class to %1$s?</string>
     <string name="change_class_message">This will remove your current class and refund all stat points then let you select a new class</string>
     <string name="change_class_confirmation_message">This will switch which gear is unlocked in shops and change your available skills</string>
     <string name="change_class_equipment_warning">This will refund your stat points, switch which gear is unlocked in shops, and change your available skills.</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 498b91806..90f3b2c23 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -95,7 +95,7 @@ class ClassSelectionActivity : BaseActivity() {
         }
 
         binding.healerWrapper.setOnClickListener { newClass = "healer" }
-        binding.mageWrapper.setOnClickListener { newClass = "wizard" }
+        binding.mageWrapper.setOnClickListener { newClass = "mage" }
         binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
         binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
         binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index ff40ee6c9..378ac46c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -147,13 +147,13 @@ class PreferencesFragment : BasePreferencesFragment(),
 
             "choose_class" -> {
                 val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
-                val isClassSelected = if (isPlayerOptedOutOfClass) false else (user?.flags?.classSelected ?: false)
+                val isClassSelected =  user?.flags?.classSelected ?: false
                 val bundle = Bundle()
                 bundle.putBoolean("isInitialSelection", isClassSelected)
                 val intent = Intent(activity, ClassSelectionActivity::class.java)
                 intent.putExtras(bundle)
 
-                if (isClassSelected) {
+                if (isClassSelected && !isPlayerOptedOutOfClass) {
                     if ((user?.gemCount ?: 0) >= 3) {
                         context?.let { context ->
                             val dialog = HabiticaAlertDialog(context)