diff --git a/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart b/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart
index 0d1c7b397..b9ec58f19 100644
--- a/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart
+++ b/lib/pangea/chat_list/utils/chat_list_handle_space_tap.dart
@@ -107,7 +107,7 @@ void chatListHandleSpaceTap(
       if (rooms.any((s) => s.spaceChildren.any((c) => c.roomId == space.id))) {
         autoJoin(space);
       } else if (justInputtedCode != null &&
-          justInputtedCode == space.classCode) {
+          justInputtedCode == space.classCode(context)) {
         // do nothing
       } else {
         showAlertDialog(context);
diff --git a/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart b/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart
index 638722a63..d44cf0e20 100644
--- a/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart
+++ b/lib/pangea/chat_settings/widgets/class_invitation_buttons.dart
@@ -41,7 +41,7 @@ class ClassInvitationButtons extends StatelessWidget {
         final String initialUrl =
             kIsWeb ? html.window.origin! : Environment.frontendURL;
         FluffyShare.share(
-          "$initialUrl/#/join_with_link?${SpaceConstants.classCode}=${room.classCode}",
+          "$initialUrl/#/join_with_link?${SpaceConstants.classCode}=${room.classCode(context)}",
           context,
         );
       },
diff --git a/pubspec.yaml b/pubspec.yaml
index 337bedc18..a590e17f1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 4.1.6+1
+version: 4.1.7+3
 
 environment:
   sdk: ">=3.0.0 <4.0.0"