diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart
index a50567eea..818dd06b4 100644
--- a/lib/pages/login/login_view.dart
+++ b/lib/pages/login/login_view.dart
@@ -147,7 +147,7 @@ class LoginView extends StatelessWidget {
                             controller.showPassword
                                 ? Icons.visibility_off_outlined
                                 : Icons.visibility_outlined,
-                            color: Colors.black,
+                            // color: Colors.black,
                           ),
                         ),
                       ),
diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart
index 1903a6200..57462a698 100644
--- a/lib/pages/new_space/new_space.dart
+++ b/lib/pages/new_space/new_space.dart
@@ -198,14 +198,6 @@ class NewSpaceController extends State<NewSpace> {
       if (capacity != null && space != null) {
         space.updateRoomCapacity(capacity);
       }
-      final newChatRoomId = await Matrix.of(context).client.createGroupChat(
-            enableEncryption: false,
-            preset: sdk.CreateRoomPreset.publicChat,
-            // Welcome chat name is '[space name acronym]: Welcome Chat'
-            groupName:
-                '${nameController.text.trim().split(RegExp(r"\s+")).map((s) => s[0]).join()}: ${L10n.of(context)!.classWelcomeChat}',
-          );
-      GoogleAnalytics.createChat(newChatRoomId);
 
       final Room? room = Matrix.of(context).client.getRoomById(spaceId);
       if (room == null) {
@@ -217,12 +209,6 @@ class NewSpaceController extends State<NewSpace> {
         return;
       }
 
-      room.setSpaceChild(newChatRoomId, suggested: true);
-      GoogleAnalytics.addParent(
-        newChatRoomId,
-        room.classCode,
-      );
-
       GoogleAnalytics.createClass(room.name, room.classCode);
       try {
         await room.invite(BotName.byEnvironment);