diff --git a/ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift b/ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
index 31e40fd5d..8f9a5d8dc 100644
--- a/ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
+++ b/ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
@@ -92,7 +92,7 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
         case .removeImage:
             actionsSubject.send(.removeImage)
         case .updateAliasLocalPart(let aliasLocalPart):
-            state.aliasLocalPart = aliasLocalPart
+            state.aliasLocalPart = aliasLocalPart.lowercased()
             // If this has been called this means that the user wants a custom address not necessarily reflecting the name
             // So we disable the two from syncing.
             syncNameAndAlias = false
diff --git a/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift b/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
index ff7fae7d9..22f8dbd78 100644
--- a/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
+++ b/ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift
@@ -195,8 +195,8 @@ struct CreateRoomScreen: View {
                         .foregroundStyle(.compound.textSecondary)
                     
                     TextField("", text: aliasBinding)
-                        .autocapitalization(.none)
-                        .textCase(.lowercase)
+                        .textInputAutocapitalization(.never)
+                        .autocorrectionDisabled()
                         .tint(.compound.iconAccentTertiary)
                         .font(.compound.bodyLG)
                         .foregroundStyle(.compound.textPrimary)
diff --git a/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift b/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
index 2c3bff524..40c3d65e3 100644
--- a/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
+++ b/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
@@ -110,7 +110,7 @@ struct JoinRoomScreen: View {
             HStack(spacing: 0) {
                 TextField("", text: $context.knockMessage, axis: .vertical)
                     .onChange(of: context.knockMessage) { _, newValue in
-                        context.knockMessage = String(newValue.prefix(1000))
+                        context.knockMessage = String(newValue.prefix(500))
                     }
                     .lineLimit(4, reservesSpace: true)
                     .font(.compound.bodyMD)