diff --git a/components/Icons/AtmosphereAccount.tsx b/components/Icons/AtmosphereAccount.tsx
new file mode 100644
index 00000000..12786047
--- /dev/null
+++ b/components/Icons/AtmosphereAccount.tsx
@@ -0,0 +1,19 @@
+import { Props } from "./Props";
+
+export const AtmosphereAccount = (props: Props) => {
+  return (
+    <svg
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M7.42941 0.325851C9.29494 0.226459 10.9487 0.464799 12.1866 0.907018C12.8043 1.1277 13.3412 1.40732 13.7503 1.74047C14.1538 2.06899 14.4846 2.4935 14.5734 3.00832C14.6759 3.60285 14.3777 4.11305 14.0275 4.47591C13.6692 4.84708 13.1697 5.162 12.6226 5.40945C11.5289 5.90404 10.0872 6.19923 8.7774 6.04846C8.29521 5.99295 7.89502 5.91048 7.61305 5.7715C7.47267 5.70231 7.28484 5.58249 7.16562 5.37167C7.09436 5.24566 7.0628 5.11507 7.06094 4.98941C6.79352 4.98084 6.53265 4.95824 6.28951 4.91811C5.88326 4.85107 5.43995 4.72246 5.10906 4.45675C4.93427 4.31638 4.77834 4.12729 4.69188 3.88185C4.60467 3.63429 4.60494 3.37697 4.66707 3.12994L4.67418 3.10283C4.83022 2.53848 5.35515 2.25748 5.74096 2.1141C6.17525 1.9527 6.6996 1.86591 7.199 1.82194C7.70579 1.77733 8.22401 1.77379 8.6645 1.79539C9.08724 1.81613 9.4942 1.86248 9.75254 1.93966C10.1168 2.04849 10.4206 2.23857 10.6272 2.52284C10.8325 2.80528 10.897 3.11882 10.897 3.39456C10.897 3.74928 10.6094 4.03684 10.2547 4.03685C9.89996 4.03685 9.61239 3.74928 9.61239 3.39456C9.61239 3.31602 9.59513 3.28782 9.58807 3.2781C9.58229 3.27016 9.54294 3.21766 9.38485 3.17043C9.28428 3.14039 9.00867 3.0984 8.60157 3.07843C8.21218 3.05934 7.75312 3.06271 7.3117 3.10157C6.86292 3.14108 6.46806 3.21427 6.18846 3.31818C6.01906 3.38113 5.94627 3.43407 5.91812 3.45868C5.99409 3.5171 6.17451 3.59718 6.49866 3.65068C7.14004 3.75653 8.02445 3.70941 8.73677 3.58078C9.06115 3.52222 9.37719 3.71872 9.4682 4.03552C9.55508 4.33806 9.40971 4.6563 9.12998 4.79106C10.1254 4.86056 11.2376 4.626 12.0932 4.23903C12.5505 4.03225 12.895 3.79955 13.1032 3.58378C13.3195 3.3597 13.3104 3.24355 13.3075 3.22653C13.2908 3.12979 13.2084 2.95578 12.9392 2.73659C12.6757 2.52202 12.2803 2.30464 11.7544 2.11674C10.7049 1.74181 9.22566 1.51655 7.49771 1.60861C5.37688 1.72162 3.66881 2.24133 2.65246 2.90657C2.14358 3.23966 1.85777 3.5761 1.73865 3.86603C1.63205 4.12551 1.63719 4.39393 1.82096 4.70639C2.05073 5.09706 2.51351 5.46124 3.21181 5.77882C3.90003 6.09181 4.74817 6.32841 5.65106 6.50578C7.23039 6.81604 8.89729 6.93038 10.0107 6.9882L10.4521 7.00994L10.4794 7.01182C10.761 7.03711 10.9944 7.24437 11.0512 7.52351C11.2344 8.42431 11.5511 9.70472 11.8398 11.0474C12.1151 12.328 12.365 13.6657 12.343 14.4827C12.3361 14.735 12.1821 14.96 11.9493 15.0576C11.6251 15.1936 11.0031 15.3456 10.3291 15.4647C9.63851 15.5868 8.82485 15.6863 8.09365 15.6967C7.73897 15.7018 7.44731 15.4184 7.44223 15.0637C7.43718 14.709 7.72064 14.4174 8.07532 14.4123C8.71614 14.4031 9.45754 14.3143 10.1055 14.1997C10.4789 14.1337 10.8002 14.0629 11.0426 13.9999C10.9883 13.3319 10.81 12.3691 10.5839 11.3174C10.3596 10.274 10.0854 9.13045 9.89632 8.26852C8.76526 8.20909 7.04824 8.08937 5.40344 7.76625C4.44991 7.57892 3.49446 7.3185 2.68006 6.94812C1.87574 6.58233 1.13675 6.0768 0.713747 5.3576C0.334501 4.71278 0.285134 4.02358 0.550388 3.3779C0.803133 2.76269 1.31557 2.24636 1.94898 1.83177C3.21726 1.00164 5.17035 0.446214 7.42941 0.325851ZM4.74603 10.4727C5.23891 10.4727 5.6385 10.9718 5.63851 11.5874C5.63851 12.203 5.23892 12.7021 4.74603 12.7021C4.25313 12.7021 3.85354 12.203 3.85354 11.5874C3.85355 10.9717 4.25314 10.4727 4.74603 10.4727ZM14.7836 7.81405C15.2429 7.81407 15.6152 8.26262 15.6152 8.81589C15.6152 9.36914 15.2429 9.81763 14.7836 9.81765C14.3243 9.81765 13.952 9.36916 13.9519 8.81589C13.9519 8.26261 14.3243 7.81405 14.7836 7.81405Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+};
diff --git a/components/LoginButton.tsx b/components/LoginButton.tsx
index 20195104..5ec2e6a1 100644
--- a/components/LoginButton.tsx
+++ b/components/LoginButton.tsx
@@ -28,11 +28,18 @@ export const LoginModal = (props: {
   asChild?: boolean;
   redirectRoute?: string;
 }) => {
+  let [open, setOpen] = useState(false);
   return (
-    <Modal asChild={props.asChild} trigger={props.trigger}>
+    <Modal
+      asChild={props.asChild}
+      trigger={props.trigger}
+      open={open}
+      onOpenChange={setOpen}
+    >
       <LoginContent
         noEmailLogin={props.noEmailLogin}
         redirectRoute={props.redirectRoute}
+        open={open}
       />
     </Modal>
   );
@@ -42,6 +49,7 @@ export const LoginContent = (props: {
   pageView?: boolean;
   noEmailLogin?: boolean;
   redirectRoute?: string;
+  open?: boolean;
 }) => {
   let identityData = useIdentityData();
   if (identityData.identity) return null;
@@ -113,6 +121,7 @@ export const LoginContent = (props: {
             </div>
             <HandleInput
               large
+              autoFocus={props.open !== false}
               action={<GoToArrow className="text-accent-contrast" />}
               loading={loading}
               onSubmit={(handle) => {
@@ -147,6 +156,7 @@ export const LoginContent = (props: {
 
             <EmailInput
               large
+              autoFocus={props.open !== false}
               value={loginEmail}
               onChange={setLoginEmail}
               loading={loading}
@@ -169,6 +179,7 @@ export const LoginContent = (props: {
           </form>
         ) : state === "email confirm" ? (
           <EmailConfirm
+            autoFocus={props.open !== false}
             emailValue={loginEmail}
             loading={loading}
             onSubmit={handleCodeSubmit}
diff --git a/components/Subscribe/EmailSubscribe.tsx b/components/Subscribe/EmailSubscribe.tsx
index bcd6a175..8dbd9f68 100644
--- a/components/Subscribe/EmailSubscribe.tsx
+++ b/components/Subscribe/EmailSubscribe.tsx
@@ -47,6 +47,7 @@ export const EmailInput = (props: {
 
 export const EmailConfirm = (props: {
   emailValue: string;
+  autoFocus?: boolean;
   loading?: boolean;
   onSubmit: (code: string) => void;
 }) => {
@@ -58,6 +59,7 @@ export const EmailConfirm = (props: {
       <div className="italic min-w-0 truncate">{props.emailValue}</div>
       <OneTimePasswordField.Root
         autoSubmit
+        autoFocus={props.autoFocus}
         validationType="alphanumeric"
         onAutoSubmit={(value) => {
           props.onSubmit(value);
diff --git a/components/Subscribe/HandleInput.tsx b/components/Subscribe/HandleInput.tsx
index fa1ecf03..3a9137a4 100644
--- a/components/Subscribe/HandleInput.tsx
+++ b/components/Subscribe/HandleInput.tsx
@@ -6,6 +6,7 @@ import { useState } from "react";
 import { useDebouncedEffect } from "src/hooks/useDebouncedEffect";
 import { DotLoader } from "components/utils/DotLoader";
 import { theme } from "tailwind.config";
+import { AtmosphereAccount } from "components/Icons/AtmosphereAccount";
 
 type ActorSuggestion = {
   handle: string;
@@ -82,7 +83,7 @@ export const HandleInput = (props: {
       className="w-(--radix-popover-trigger-width)!"
       trigger={
         <div
-          className={`handleInput input-with-border relative py-0! flex items-center gap-1 w-full ${props.large && "px-2!"} ${props.className}`}
+          className={`handleInput input-with-border relative py-0! flex items-center gap-2 w-full ${props.large && "px-2!"} ${props.className}`}
           style={
             props.loading
               ? {
@@ -96,7 +97,7 @@ export const HandleInput = (props: {
           }
         >
           <div className="text-tertiary text-center shrink-0 flex justify-end h-full items-center">
-            @
+            <AtmosphereAccount />
           </div>
           <Input
             autoFocus={props.autoFocus}