diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index ca0dbb827..8c9c5cf39 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -99,7 +99,6 @@
 		182BC46E27C4CD6D00A30C33 /* ActivityDismissal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityDismissal.swift; sourceTree = "<group>"; };
 		182BC47827C4CE2200A30C33 /* LabelledActivityIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelledActivityIndicatorView.swift; sourceTree = "<group>"; };
 		182BC47A27C4D05200A30C33 /* FullscreenLoadingActivityPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FullscreenLoadingActivityPresenter.swift; sourceTree = "<group>"; };
-		184230FE27BD080000033771 /* matrix-rust-components-swift */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "matrix-rust-components-swift"; path = "../matrix-rust-components-swift"; sourceTree = "<group>"; };
 		1850252427B6918C002E6B18 /* ElementX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1850253A27B6918D002E6B18 /* ElementXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ElementXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		1850253E27B6918D002E6B18 /* ElementXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementXTests.swift; sourceTree = "<group>"; };
@@ -215,7 +214,6 @@
 		1850251B27B6918C002E6B18 = {
 			isa = PBXGroup;
 			children = (
-				184230FE27BD080000033771 /* matrix-rust-components-swift */,
 				1850252627B6918C002E6B18 /* ElementX */,
 				1850253D27B6918D002E6B18 /* ElementXTests */,
 				1850254727B6918D002E6B18 /* ElementXUITests */,
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 87eda342b..04500e374 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -19,6 +19,15 @@
           "version": "7.1.2"
         }
       },
+      {
+        "package": "MatrixRustSDK",
+        "repositoryURL": "https://github.com/matrix-org/matrix-rust-components-swift.git",
+        "state": {
+          "branch": "main",
+          "revision": "6c12bce335811dd50679bbdb950a1cb0b43bec08",
+          "version": null
+        }
+      },
       {
         "package": "SwiftyBeaver",
         "repositoryURL": "https://github.com/SwiftyBeaver/SwiftyBeaver",
diff --git a/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenViewModel.swift b/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenViewModel.swift
index 0e9f99631..841f89295 100644
--- a/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenViewModel.swift
+++ b/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenViewModel.swift
@@ -34,8 +34,8 @@ class LoginScreenViewModel: LoginScreenViewModelType, LoginScreenViewModelProtoc
     // MARK: - Setup
 
     init() {
-        super.init(initialViewState: LoginScreenViewState(bindings: LoginScreenViewStateBindings(username: "@stefan.ceriu-element01:matrix.org",
-                                                                                                 password: "radeon")))
+        super.init(initialViewState: LoginScreenViewState(bindings: LoginScreenViewStateBindings(username: "",
+                                                                                                 password: "")))
     }
 
     // MARK: - Public
diff --git a/ElementX/Sources/Modules/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Modules/Authentication/LoginScreen/View/LoginScreen.swift
index 5d688ad9e..e03890cd9 100644
--- a/ElementX/Sources/Modules/Authentication/LoginScreen/View/LoginScreen.swift
+++ b/ElementX/Sources/Modules/Authentication/LoginScreen/View/LoginScreen.swift
@@ -25,6 +25,8 @@ struct LoginScreen: View {
             VStack {
                 TextField("Username", text: $context.username)
                     .textFieldStyle(.roundedBorder)
+                    .disableAutocorrection(true)
+                    .autocapitalization(.none)
                 SecureField("Enter a password", text: $context.password)
                     .textFieldStyle(.roundedBorder)