diff --git a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift b/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift
index 8659e150..3daa2eb1 100644
--- a/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift
+++ b/Mastodon/Scene/Onboarding/Register/Cell/MastodonRegisterTextFieldTableViewCell.swift
@@ -87,6 +87,8 @@ extension MastodonRegisterTextFieldTableViewCell {
         textField.autocapitalizationType = .none
         textField.attributedPlaceholder = nil
         textField.isSecureTextEntry = false
+        textField.textAlignment = .natural
+        textField.semanticContentAttribute = .unspecified
         
         let paddingRect = CGRect(x: 0, y: 0, width: 16, height: 10)
         textField.leftView = UIView(frame: paddingRect)
diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift
index b172dd40..beb16890 100644
--- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift
+++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel+Diffable.swift
@@ -55,6 +55,8 @@ extension MastodonRegisterViewModel {
                 cell.textField.keyboardType = .alphabet
                 cell.textField.autocorrectionType = .no
                 cell.textField.text = self.username
+                cell.textField.textAlignment = .left
+                cell.textField.semanticContentAttribute = .forceLeftToRight
                 NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField)
                     .receive(on: DispatchQueue.main)
                     .compactMap { notification in
@@ -94,6 +96,8 @@ extension MastodonRegisterViewModel {
                 cell.textField.autocorrectionType = .no
                 cell.textField.isSecureTextEntry = true
                 cell.textField.text = self.password
+                cell.textField.textAlignment = .left
+                cell.textField.semanticContentAttribute = .forceLeftToRight
                 NotificationCenter.default.publisher(for: UITextField.textDidChangeNotification, object: cell.textField)
                     .receive(on: DispatchQueue.main)
                     .compactMap { notification in