diff --git a/backend/app/services/login_mfa.py b/backend/app/services/login_mfa.py
index 797d8ef..877a29e 100644
--- a/backend/app/services/login_mfa.py
+++ b/backend/app/services/login_mfa.py
@@ -53,16 +53,6 @@ def mfa_phone_parts(account: Account) -> tuple[str, str]:
         ) from error
 
 
-def assert_mfa_phone(account: Account) -> None:
-    try:
-        parse_india_phone(account.phone_number)
-    except ValueError as error:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=str(error),
-        ) from error
-
-
 async def create_login_challenge(
     database,
     account: Account,
diff --git a/frontend/src/components/CompanySecurity.jsx b/frontend/src/components/CompanySecurity.jsx
index db9300a..f1bc897 100644
--- a/frontend/src/components/CompanySecurity.jsx
+++ b/frontend/src/components/CompanySecurity.jsx
@@ -119,8 +119,8 @@ export default function CompanySecurity() {
             <h2>Session timeout</h2>
             <div className="security-setting-row">
               <div>
-                <strong>Automatically sign out inactive users</strong>
-                <p>Users are signed out after a period of inactivity.</p>
+                <strong>Maximum session length</strong>
+                <p>Organization members cannot stay signed in longer than this, even if they choose a longer personal setting.</p>
               </div>
               <select
                 className="security-timeout-select"
diff --git a/frontend/src/components/DashboardPage.jsx b/frontend/src/components/DashboardPage.jsx
index 765344a..d1b98bf 100644
--- a/frontend/src/components/DashboardPage.jsx
+++ b/frontend/src/components/DashboardPage.jsx
@@ -500,7 +500,7 @@ export default function DashboardPage() {
       </aside>
 
       <main className="dashboard-content">
-        {companyActive && !["Overview", "Domains", "People", "Groups", "Aliases", "Security", "Administrators"].includes(companyActive) && (
+        {companyActive && !["Overview", "Domains", "People", "Groups", "Aliases", "Security", "Administrators", "Settings"].includes(companyActive) && (
           <div className="dashboard-content-heading">
             <div><p>{workspaceTitle}</p><h1>{companyActive}</h1></div>
             <span className="dashboard-account-pill">{workspaceLabel}</span>
@@ -599,14 +599,14 @@ export default function DashboardPage() {
         {companyActive === "Administrators" && isDomainOwner && (
           <CompanyAdministrators account={account} />
         )}
-        {companyActive && !["Overview", "Domains", "People", "Groups", "Aliases", "Security", "Administrators"].includes(companyActive) && (
+        {companyActive && !["Overview", "Domains", "People", "Groups", "Aliases", "Security", "Administrators", "Settings"].includes(companyActive) && (
           <section className="dashboard-empty dashboard-company-view">
             <span><Sparkles size={24} /></span>
             <h2>{companyActive}</h2>
             <p>Company {companyActive.toLowerCase()} controls will appear here.</p>
           </section>
         )}
-        {!companyActive && active === "Settings" && (
+        {(active === "Settings" || companyActive === "Settings") && (
           <AccountSettings />
         )}
         {!companyActive && !["Inbox", "Outbox", "Trash", "Settings"].includes(active) && (