diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift
index 919443f2d..5fd8c31b6 100644
--- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift
+++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift
@@ -82,10 +82,36 @@ final class MastodonRegisterViewModel {
             .assign(to: \.value, on: usernameValidateState)
             .store(in: &disposeBag)
         
-        username.debounce(for: .milliseconds(300), scheduler: DispatchQueue.main).removeDuplicates()
-            .sink { [weak self] text in
-                self?.lookupAccount(by: text)
+        username
+            .filter { !$0.isEmpty }
+            .debounce(for: .milliseconds(300), scheduler: DispatchQueue.main)
+            .removeDuplicates()
+            .compactMap { [weak self] text -> AnyPublisher<Result<Mastodon.Response.Content<Mastodon.Entity.Account>, Error>, Never>? in
+                guard let self = self else { return nil }
+                let query = Mastodon.API.Account.AccountLookupQuery(acct: text)
+                return context.apiService.accountLookup(domain: domain, query: query, authorization: self.applicationAuthorization)
+                    .map {
+                        response -> Result<Mastodon.Response.Content<Mastodon.Entity.Account>, Error>in
+                        Result.success(response)
+                    }
+                    .catch { error in
+                        Just(Result.failure(error))
+                    }
+                    .eraseToAnyPublisher()
             }
+            .switchToLatest()
+            .sink(receiveCompletion: { _ in
+                
+            }, receiveValue: { [weak self] result in
+                guard let self = self else { return }
+                switch result {
+                case .success:
+                    let text = L10n.Scene.Register.Error.Reason.taken(L10n.Scene.Register.Error.Item.username)
+                    self.usernameErrorPrompt.value = MastodonRegisterViewModel.errorPromptAttributedString(for: text)
+                case .failure:
+                    break
+                }
+            })
             .store(in: &disposeBag)
         
         usernameValidateState
@@ -133,7 +159,8 @@ final class MastodonRegisterViewModel {
                 let error = error as? Mastodon.API.Error
                 let mastodonError = error?.mastodonError
                 if case let .generic(genericMastodonError) = mastodonError,
-                   let details = genericMastodonError.details {
+                   let details = genericMastodonError.details
+                {
                     self.usernameErrorPrompt.value = details.usernameErrorDescriptions.first.flatMap { MastodonRegisterViewModel.errorPromptAttributedString(for: $0) }
                     self.emailErrorPrompt.value = details.emailErrorDescriptions.first.flatMap { MastodonRegisterViewModel.errorPromptAttributedString(for: $0) }
                     self.passwordErrorPrompt.value = details.passwordErrorDescriptions.first.flatMap { MastodonRegisterViewModel.errorPromptAttributedString(for: $0) }
@@ -157,29 +184,12 @@ final class MastodonRegisterViewModel {
         
         Publishers.CombineLatest(
             publisherOne,
-            approvalRequired ? reasonValidateState.map {$0 == .valid}.eraseToAnyPublisher() : Just(true).eraseToAnyPublisher()
+            approvalRequired ? reasonValidateState.map { $0 == .valid }.eraseToAnyPublisher() : Just(true).eraseToAnyPublisher()
         )
         .map { $0 && $1 }
         .assign(to: \.value, on: isAllValid)
         .store(in: &disposeBag)
     }
-    
-    func lookupAccount(by acct: String) {
-        if acct.isEmpty {
-            return
-        }
-        let query = Mastodon.API.Account.AccountLookupQuery(acct: acct)
-        context.apiService.accountLookup(domain: domain, query: query, authorization: applicationAuthorization)
-            .sink { _ in
-
-            } receiveValue: { [weak self] account in
-                guard let self = self else { return }
-                let text = L10n.Scene.Register.Error.Reason.taken(L10n.Scene.Register.Error.Item.username)
-                self.usernameErrorPrompt.value = MastodonRegisterViewModel.errorPromptAttributedString(for: text)
-            }
-            .store(in: &disposeBag)
-
-    }
 }
 
 extension MastodonRegisterViewModel {
@@ -191,7 +201,6 @@ extension MastodonRegisterViewModel {
 }
 
 extension MastodonRegisterViewModel {
-    
     static func isValidEmail(_ email: String) -> Bool {
         let emailRegEx = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
 
@@ -241,5 +250,4 @@ extension MastodonRegisterViewModel {
         
         return attributeString
     }
-    
 }
diff --git a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift
index 447896c22..d8638421a 100644
--- a/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift
+++ b/Mastodon/Scene/Onboarding/ServerRules/MastodonServerRulesViewController.swift
@@ -204,7 +204,7 @@ extension MastodonServerRulesViewController {
     @objc private func confirmButtonPressed(_ sender: UIButton) {
         os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
 
-        let viewModel = MastodonRegisterViewModel(domain: self.viewModel.domain,context: self.context, authenticateInfo: self.viewModel.authenticateInfo, instance: self.viewModel.instance, applicationToken: self.viewModel.applicationToken)
+        let viewModel = MastodonRegisterViewModel(domain: self.viewModel.domain, context: self.context, authenticateInfo: self.viewModel.authenticateInfo, instance: self.viewModel.instance, applicationToken: self.viewModel.applicationToken)
         self.coordinator.present(scene: .mastodonRegister(viewModel: viewModel), from: self, transition: .show)
     }
 }
diff --git a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account.swift b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account.swift
index 78f338b6f..d1c5458c4 100644
--- a/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account.swift
+++ b/MastodonSDK/Sources/MastodonSDK/API/Mastodon+API+Account.swift
@@ -161,7 +161,7 @@ extension Mastodon.API.Account {
     ///   - session: `URLSession`
     ///   - domain: Mastodon instance domain. e.g. "example.com"
     ///   - query: `AccountInfoQuery` with account query information,
-    ///   - authorization: user token
+    ///   - authorization: app token
     /// - Returns: `AnyPublisher` contains `Account` nested in the response
     public static func lookupAccount(
         session: URLSession,