diff --git a/submodules/TelegramCore/Sources/Authorization.swift b/submodules/TelegramCore/Sources/Authorization.swift
index ee429ff014..31875955eb 100644
--- a/submodules/TelegramCore/Sources/Authorization.swift
+++ b/submodules/TelegramCore/Sources/Authorization.swift
@@ -365,7 +365,7 @@ public func sendAuthorizationCode(accountManager: AccountManager<TelegramAccount
                             
                             let user = TelegramUser(user: user)
                             var isSupportUser = false
-                            if let phone = user.phone, phone.hasPrefix("42") {
+                            if let phone = user.phone, phone.hasPrefix("42"), phone.count <= 5 {
                                 isSupportUser = true
                             }
                             let state = AuthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, peerId: user.id, state: nil, invalidatedChannels: [])
diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift
index d8ce813d31..b734ce065b 100644
--- a/submodules/TelegramUI/Sources/SharedAccountContext.swift
+++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift
@@ -532,7 +532,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                         sortIndex = sortOrder.order
                     } else if case let .backupData(backupDataValue) = attribute {
                         backupData = backupDataValue.data
-                    } else if case .supportUserInfo = attribute {
+                    } else if case .supportUserInfo = attribute, !"".isEmpty {
                         isSupportUser = true
                     }
                 }