diff --git a/src/auth/account.tsx b/src/auth/account.tsx
index b97159f..206afe9 100644
--- a/src/auth/account.tsx
+++ b/src/auth/account.tsx
@@ -188,6 +188,8 @@ export const AccountManager = () => {
 
         <Show when={scopeFlow.showScopeSelector()}>
           <ScopeSelector
+            title="Edit permissions"
+            confirmLabel="Save permissions"
             initialScopes={parseScopeString(
               sessions[scopeFlow.pendingAccount()]?.grantedScopes || "",
             )}
diff --git a/src/auth/login.tsx b/src/auth/login.tsx
index 36a0f31..ff27c1e 100644
--- a/src/auth/login.tsx
+++ b/src/auth/login.tsx
@@ -14,10 +14,6 @@ export const Login = (props: LoginProps) => {
 
   const scopeFlow = useOAuthScopeFlow({
     onError: (e) => setNotice(`${e}`),
-    onRedirecting: () => {
-      setNotice(`Contacting your data server...`);
-      setTimeout(() => setNotice(`Redirecting...`), 0);
-    },
   });
 
   const initiateLogin = (handle: string) => {
diff --git a/src/auth/scope-selector.tsx b/src/auth/scope-selector.tsx
index 42b8bb4..bd17de9 100644
--- a/src/auth/scope-selector.tsx
+++ b/src/auth/scope-selector.tsx
@@ -1,59 +1,136 @@
-import { createSignal, For, Show } from "solid-js";
+import { createSignal, Show } from "solid-js";
 
 import { AlphaBadge } from "../components/alpha-badge.jsx";
 import {
   buildScopeString,
-  GRANULAR_SCOPES,
   SPACE_MANAGE_RECORDS_SCOPE_ID,
   SPACE_READ_SCOPE_ID,
 } from "./scope-utils";
 
 interface ScopeSelectorProps {
-  onConfirm: (scopeString: string) => void;
+  onConfirm: (scopeString: string) => void | Promise<void>;
   onCancel: () => void;
   initialScopes?: Set<string>;
+  title?: string;
+  confirmLabel?: string;
 }
 
+const PermissionRow = (props: {
+  label: string;
+  description?: string;
+  checked: boolean;
+  onClick: () => void;
+}) => (
+  <button
+    type="button"
+    aria-pressed={props.checked}
+    onclick={props.onClick}
+    class="group flex w-full items-start gap-3 rounded-md px-2 py-2 text-left hover:bg-neutral-100 active:bg-neutral-200 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"
+  >
+    <div
+      class="mt-0.5 flex size-5 shrink-0 items-center justify-center rounded border-2"
+      classList={{
+        "border-transparent bg-blue-500 group-hover:bg-blue-600 group-active:bg-blue-400":
+          props.checked,
+        "border-neutral-400 group-hover:border-neutral-500 dark:border-neutral-500 dark:group-hover:border-neutral-400":
+          !props.checked,
+      }}
+    >
+      <Show when={props.checked}>
+        <span class="iconify lucide--check text-sm text-white"></span>
+      </Show>
+    </div>
+    <span class="flex min-w-0 flex-col">
+      <span class="text-sm font-medium">{props.label}</span>
+      <Show when={props.description}>
+        <span class="text-xs leading-4 text-neutral-600 dark:text-neutral-400">
+          {props.description}
+        </span>
+      </Show>
+    </span>
+  </button>
+);
+
 export const ScopeSelector = (props: ScopeSelectorProps) => {
-  const [selectedScopes, setSelectedScopes] = createSignal<Set<string>>(
+  const initialScopes = () => {
     // Space access is deliberately opt-in while the protocol is in alpha.
-    props.initialScopes || new Set(["create", "update", "delete", "blob"]),
-  );
-
-  const isBlobDisabled = () => {
-    const scopes = selectedScopes();
-    return (
-      !scopes.has("create") && !scopes.has("update") && !scopes.has(SPACE_MANAGE_RECORDS_SCOPE_ID)
-    );
+    const scopes = new Set(props.initialScopes || ["create", "update", "delete"]);
+    scopes.delete("blob");
+    if (scopes.has("create") || scopes.has("update")) {
+      scopes.add("create");
+      scopes.add("update");
+    }
+    if (scopes.has(SPACE_MANAGE_RECORDS_SCOPE_ID)) scopes.add(SPACE_READ_SCOPE_ID);
+    return scopes;
   };
+  const initial = initialScopes();
+  const [selectedScopes, setSelectedScopes] = createSignal(initial);
+  const [submitting, setSubmitting] = createSignal(false);
 
   const toggleScope = (scopeId: string) => {
     setSelectedScopes((prev) => {
       const newSet = new Set(prev);
       if (newSet.has(scopeId)) {
         newSet.delete(scopeId);
-        if (scopeId === SPACE_READ_SCOPE_ID) {
-          newSet.delete(SPACE_MANAGE_RECORDS_SCOPE_ID);
-        }
-        if (
-          !newSet.has("create") &&
-          !newSet.has("update") &&
-          !newSet.has(SPACE_MANAGE_RECORDS_SCOPE_ID)
-        ) {
-          newSet.delete("blob");
-        }
       } else {
         newSet.add(scopeId);
-        if (scopeId === SPACE_MANAGE_RECORDS_SCOPE_ID) {
-          newSet.add(SPACE_READ_SCOPE_ID);
-        }
       }
       return newSet;
     });
   };
 
-  const handleConfirm = () => {
-    props.onConfirm(buildScopeString(selectedScopes()));
+  const hasCreate = () => selectedScopes().has("create");
+  const hasUpdate = () => selectedScopes().has("update");
+  const hasWrite = () => hasCreate() && hasUpdate();
+
+  const toggleWrite = () => {
+    setSelectedScopes((prev) => {
+      const newSet = new Set(prev);
+      if (newSet.has("create") && newSet.has("update")) {
+        newSet.delete("create");
+        newSet.delete("update");
+      } else {
+        newSet.add("create");
+        newSet.add("update");
+      }
+      return newSet;
+    });
+  };
+
+  const toggleSpaceRead = () => {
+    setSelectedScopes((prev) => {
+      const newSet = new Set(prev);
+      if (newSet.has(SPACE_READ_SCOPE_ID)) {
+        newSet.delete(SPACE_READ_SCOPE_ID);
+        newSet.delete(SPACE_MANAGE_RECORDS_SCOPE_ID);
+      } else {
+        newSet.add(SPACE_READ_SCOPE_ID);
+      }
+      return newSet;
+    });
+  };
+
+  const toggleSpaceEdit = () => {
+    setSelectedScopes((prev) => {
+      const newSet = new Set(prev);
+      if (newSet.has(SPACE_MANAGE_RECORDS_SCOPE_ID)) {
+        newSet.delete(SPACE_MANAGE_RECORDS_SCOPE_ID);
+      } else {
+        newSet.add(SPACE_READ_SCOPE_ID);
+        newSet.add(SPACE_MANAGE_RECORDS_SCOPE_ID);
+      }
+      return newSet;
+    });
+  };
+
+  const handleConfirm = async () => {
+    if (submitting()) return;
+    setSubmitting(true);
+    try {
+      await props.onConfirm(buildScopeString(selectedScopes()));
+    } catch {
+      setSubmitting(false);
+    }
   };
 
   return (
@@ -65,47 +142,61 @@ export const ScopeSelector = (props: ScopeSelectorProps) => {
         >
           <span class="iconify lucide--arrow-left"></span>
         </button>
-        <div class="font-semibold">Select permissions</div>
+        <div class="font-semibold">{props.title || "Select permissions"}</div>
       </div>
-      <div class="flex flex-col px-1">
-        <For each={GRANULAR_SCOPES}>
-          {(scope) => {
-            const isSelected = () => selectedScopes().has(scope.id);
-            const isDisabled = () => scope.id === "blob" && isBlobDisabled();
+      <div class="flex flex-col gap-4">
+        <section>
+          <div class="mb-1 px-2 text-xs font-semibold tracking-wide text-neutral-500 uppercase dark:text-neutral-400">
+            Repository
+          </div>
+          <div class="flex flex-col">
+            <PermissionRow
+              label="Create and edit records"
+              description="Includes file uploads."
+              checked={hasWrite()}
+              onClick={toggleWrite}
+            />
+            <PermissionRow
+              label="Delete records"
+              description="Also required to recreate records."
+              checked={selectedScopes().has("delete")}
+              onClick={() => toggleScope("delete")}
+            />
+          </div>
+        </section>
 
-            return (
-              <button
-                onclick={() => !isDisabled() && toggleScope(scope.id)}
-                disabled={isDisabled()}
-                class="group flex items-center gap-3 py-1.5"
-                classList={{ "opacity-50": isDisabled() }}
-              >
-                <div
-                  class="flex size-5 items-center justify-center rounded border-2"
-                  classList={{
-                    "bg-blue-500 border-transparent group-hover:bg-blue-600 group-active:bg-blue-400":
-                      isSelected() && !isDisabled(),
-                    "border-neutral-400 dark:border-neutral-500 group-hover:border-neutral-500 dark:group-hover:border-neutral-400 group-hover:bg-neutral-100 dark:group-hover:bg-neutral-800":
-                      !isSelected() && !isDisabled(),
-                    "border-neutral-300 dark:border-neutral-600": isDisabled(),
-                  }}
-                >
-                  {isSelected() && <span class="iconify lucide--check text-sm text-white"></span>}
-                </div>
-                <span>{scope.label}</span>
-                <Show when={"alpha" in scope && scope.alpha}>
-                  <AlphaBadge />
-                </Show>
-              </button>
-            );
-          }}
-        </For>
+        <section>
+          <div class="mb-2 flex items-center gap-2 px-2">
+            <span class="text-xs font-semibold tracking-wide text-neutral-500 uppercase dark:text-neutral-400">
+              Spaces
+            </span>
+            <AlphaBadge />
+          </div>
+          <div class="flex flex-col">
+            <PermissionRow
+              label="View non-public records"
+              description="Access records shared through Spaces."
+              checked={selectedScopes().has(SPACE_READ_SCOPE_ID)}
+              onClick={toggleSpaceRead}
+            />
+            <PermissionRow
+              label="Write non-public records"
+              description="Create, update, and delete non-public records."
+              checked={selectedScopes().has(SPACE_MANAGE_RECORDS_SCOPE_ID)}
+              onClick={toggleSpaceEdit}
+            />
+          </div>
+        </section>
       </div>
       <button
+        disabled={submitting()}
         onclick={handleConfirm}
-        class="dark:hover:bg-dark-200 dark:active:bg-dark-100 flex w-full items-center justify-center gap-2 rounded-lg border border-neutral-200 px-3 py-2 hover:bg-neutral-100 active:bg-neutral-200 dark:border-neutral-700"
+        class="dark:hover:bg-dark-200 dark:active:bg-dark-100 flex w-full items-center justify-center gap-2 rounded-lg border border-neutral-200 px-3 py-2 hover:bg-neutral-100 active:bg-neutral-200 disabled:opacity-70 dark:border-neutral-700"
       >
-        Continue
+        <Show when={submitting()} fallback={props.confirmLabel || "Continue"}>
+          <span class="iconify lucide--loader-circle animate-spin"></span>
+          <span>Preparing authorization…</span>
+        </Show>
       </button>
     </div>
   );
diff --git a/src/auth/scope-utils.ts b/src/auth/scope-utils.ts
index 7e8cb2f..b20e167 100644
--- a/src/auth/scope-utils.ts
+++ b/src/auth/scope-utils.ts
@@ -12,12 +12,12 @@ export const GRANULAR_SCOPES = [
   {
     id: "create",
     scope: "repo:*?action=create",
-    label: "Create records",
+    label: "Create and edit records",
   },
   {
     id: "update",
     scope: "repo:*?action=update",
-    label: "Update records",
+    label: "Create and edit records",
   },
   {
     id: "delete",
@@ -32,13 +32,13 @@ export const GRANULAR_SCOPES = [
   {
     id: SPACE_READ_SCOPE_ID,
     scope: SPACE_READ_SCOPE,
-    label: "Read Space records",
+    label: "View non-public records",
     alpha: true,
   },
   {
     id: SPACE_MANAGE_RECORDS_SCOPE_ID,
     scope: SPACE_MANAGE_RECORDS_SCOPE,
-    label: "Manage Space records",
+    label: "Write non-public records",
     alpha: true,
   },
 ] as const;
@@ -48,7 +48,14 @@ export type ScopeId = (typeof GRANULAR_SCOPES)[number]["id"];
 const BASE_SCOPES = ["atproto"];
 
 export const buildScopeString = (selected: Set<string>): string => {
-  const granular = GRANULAR_SCOPES.filter((s) => selected.has(s.id)).map((s) => s.scope);
+  const needsSpaceReadScope = selected.has(SPACE_MANAGE_RECORDS_SCOPE_ID);
+  const needsBlobScope =
+    selected.has("create") || selected.has("update") || selected.has(SPACE_MANAGE_RECORDS_SCOPE_ID);
+  const granular = GRANULAR_SCOPES.filter(({ id }) => {
+    if (id === "blob") return needsBlobScope;
+    if (id === SPACE_READ_SCOPE_ID) return needsSpaceReadScope || selected.has(id);
+    return selected.has(id);
+  }).map(({ scope }) => scope);
   return [...BASE_SCOPES, ...granular].join(" ");
 };
 
diff --git a/src/components/create/confirm-submit.tsx b/src/components/create/confirm-submit.tsx
index 381ef01..db55597 100644
--- a/src/components/create/confirm-submit.tsx
+++ b/src/components/create/confirm-submit.tsx
@@ -59,7 +59,7 @@ export const ConfirmSubmit = (props: {
               onChange={(e) => props.setRecreate(e.currentTarget.checked)}
               class="h-3.5 w-3.5 accent-blue-500"
             />
-            Recreate{!hasUserScope("create") ? " (create permission needed)" : ""}
+            Recreate{!hasUserScope("create") ? " (create and edit permission needed)" : ""}
           </label>
           <p class="text-xs text-neutral-500 dark:text-neutral-400">
             Delete the existing record and create a new one with the same record key.
diff --git a/src/components/permission-prompt.tsx b/src/components/permission-prompt.tsx
index 68f0afd..9506089 100644
--- a/src/components/permission-prompt.tsx
+++ b/src/components/permission-prompt.tsx
@@ -21,7 +21,7 @@ export const PermissionPromptContainer = () => {
 
   const scopeLabel = () => {
     const scope = GRANULAR_SCOPES.find((s) => s.id === displayedScope());
-    return scope?.label.toLowerCase() || displayedScope();
+    return scope?.label || displayedScope();
   };
 
   const handleEditPermissions = () => {
@@ -41,7 +41,7 @@ export const PermissionPromptContainer = () => {
     >
       <h2 class="mb-2 font-semibold">Permission required</h2>
       <p class="mb-4 text-sm text-neutral-600 dark:text-neutral-400">
-        You need the "{scopeLabel()}" permission to perform this action.
+        Enable “{scopeLabel()}” in permissions to perform this action.
       </p>
       <div class="flex justify-end gap-2">
         <Button onClick={() => setRequestedScope(null)}>Cancel</Button>
diff --git a/src/views/spaces/index.tsx b/src/views/spaces/index.tsx
index 2296967..a1b33e7 100644
--- a/src/views/spaces/index.tsx
+++ b/src/views/spaces/index.tsx
@@ -57,7 +57,7 @@ const PermissionPrompt = () => {
       <div>
         <h2 class="font-medium">Space permission required</h2>
         <p class="mt-1 text-sm text-neutral-600 dark:text-neutral-400">
-          Re-authorize this account and enable “Read Space records”.
+          Re-authorize this account and enable “View non-public records”.
         </p>
       </div>
       <Button