diff --git a/app/accounts/[id]/page.tsx b/app/accounts/[id]/page.tsx
index 3e0d5c5..13601f3 100644
--- a/app/accounts/[id]/page.tsx
+++ b/app/accounts/[id]/page.tsx
@@ -53,7 +53,7 @@ function AccountTypePicker({ account, firm, onAssigned }: {
                 className="border border-slate-200 rounded-md px-1.5 py-1 text-xs bg-white text-slate-700 focus:outline-none focus:ring-1 focus:ring-blue-400"
             >
                 <option value="">
-                    {account.accountTypeLabel ? `Auto — ${account.accountTypeLabel}` : 'Auto — unassigned'}
+                    {account.accountTypeLabel ?? 'Unassigned'}
                 </option>
                 {firm.accounts.map((type) => (
                     <option key={type.id} value={type.id}>
diff --git a/app/page.tsx b/app/page.tsx
index 3b02cfc..1bd7ad5 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -159,7 +159,7 @@ function AccountTypeCell({ account, firm, onAssigned }: {
                 }`}
             >
                 <option value="">
-                    {account.accountTypeLabel ? `Auto — ${account.accountTypeLabel}` : 'Auto — unassigned'}
+                    {account.accountTypeLabel ?? 'Unassigned'}
                 </option>
                 {firm.accounts.map((type) => (
                     <option key={type.id} value={type.id}>
@@ -604,6 +604,12 @@ export default function Home() {
         }
     };
 
+    // A firm with no stored login can do nothing until someone enters one, so it
+    // sits below the ones that are actually running rather than interleaving by
+    // name. Within each group, catalog order (by name) is preserved.
+    const orderedConfig = [...config].sort((a, b) =>
+        Number(b.hasCredentials) - Number(a.hasCredentials) || a.firm.localeCompare(b.firm));
+
     // Count dead accounts across all firms for the toggle button label
     const deadCount = firms.reduce((total, firmState) => {
         const firmCfg = config.find((c) => c.id === firmState.firmId);
@@ -798,7 +804,7 @@ export default function Home() {
                                     </td>
                                 </tr>
                             ) : (
-                                config.map((cfg) => {
+                                orderedConfig.map((cfg) => {
                                     const state = firms.find((f) => f.firmId === cfg.id)
                                         ?? { firmId: cfg.id, firm: cfg.firm, connected: false, accounts: [] };
                                     return (