diff --git a/Ring/Ring/Features/Settings/Me/AccountSummaryVM.swift b/Ring/Ring/Features/Settings/Me/AccountSummaryVM.swift
index c7a7bb1bb7733a4f6bc5692cb46b6227c65ac320..fcc2d30ed239e8d122d1a2bc3c428bb2e79453b8 100644
--- a/Ring/Ring/Features/Settings/Me/AccountSummaryVM.swift
+++ b/Ring/Ring/Features/Settings/Me/AccountSummaryVM.swift
@@ -180,8 +180,7 @@ extension AccountSummaryVM {
         self.accountService.sharedResponseStream
             .filter({ [weak self] serviceEvent in
                 guard let self = self else { return false }
-                guard serviceEvent
-                        .getEventInput(ServiceEventInput.registrationState) != nil else { return false }
+                guard serviceEvent.getEventInput(ServiceEventInput.registrationState) as String? != nil else { return false }
                 guard let accountId: String = serviceEvent
                         .getEventInput(ServiceEventInput.accountId),
                       accountId == self.account.id else { return false }
diff --git a/Ring/Ring/Features/Settings/Me/AccountSummaryView.swift b/Ring/Ring/Features/Settings/Me/AccountSummaryView.swift
index 1ed72d02bbc83270fb52b826f4cfe137bba539fb..cd4ff1c7268365cd8aa706727f9b2fb030ebdb14 100644
--- a/Ring/Ring/Features/Settings/Me/AccountSummaryView.swift
+++ b/Ring/Ring/Features/Settings/Me/AccountSummaryView.swift
@@ -47,11 +47,17 @@ struct AccountSummaryView: View {
                 profileSection()
 
                 Section(header: Text(L10n.AccountPage.accountHeader)) {
-                    ToggleCell(
-                        toggleText: L10n.Account.statusOnline,
-                        getAction: { model.accountEnabled },
-                        setAction: { newValue in model.enableAccount(enable: newValue) }
-                    )
+                    HStack {
+                        Text(model.accountStatus)
+                        Spacer()
+                        Toggle("", isOn: Binding(
+                            get: { model.accountEnabled },
+                            set: { newValue in model.enableAccount(enable: newValue) }
+                        ))
+                        .labelsHidden()
+                        .toggleStyle(SwitchToggleStyle(tint: Color.jamiColor))
+                    }
+                    .accessibilityElement(children: .combine)
                 }
 
                 if model.account.type == .sip {