diff --git a/frontend/src/stores/phone.ts b/frontend/src/stores/phone.ts
index 2772514..68c1b49 100644
--- a/frontend/src/stores/phone.ts
+++ b/frontend/src/stores/phone.ts
@@ -287,7 +287,7 @@ const defaultLocales: LocaleTree = {
       accountLocalDetail: 'Not signed in',
       accountCloudDetail: 'Mail and notes sync through iFruit Cloud',
       accountLoginBody:
-        'Sign in is optional. This phone also works with local data only.',
+        'Sign in to keep your Mail and Notes. Without an iFruit Account, this data is lost with the phone.',
       accountInformation: 'Account Information',
       accountStatus: 'Account Status',
       accountStatusValue: 'Active',
diff --git a/frontend/src/views/apps/MailApp.vue b/frontend/src/views/apps/MailApp.vue
index 0ba6944..62edc46 100644
--- a/frontend/src/views/apps/MailApp.vue
+++ b/frontend/src/views/apps/MailApp.vue
@@ -397,7 +397,7 @@ onBeforeUnmount(() => {
         )
       }}
     </k-block-title>
-    <k-list>
+    <k-list class="bg-black">
       <k-list-input
         class="relative"
         :value="authEmail"
diff --git a/frontend/src/views/apps/SettingsApp.vue b/frontend/src/views/apps/SettingsApp.vue
index 737c6dd..040cc9a 100644
--- a/frontend/src/views/apps/SettingsApp.vue
+++ b/frontend/src/views/apps/SettingsApp.vue
@@ -12,6 +12,7 @@ import {
   kNavbar,
   kNavbarBackLink,
   kPage,
+  kPreloader,
   kRange,
   kSearchbar,
   kToast,
@@ -21,6 +22,7 @@ import {
   BellRing,
   Check,
   EyeOff,
+  KeyRound,
   Monitor,
   Plane,
   RotateCcw,
@@ -426,24 +428,45 @@ async function confirmFactoryReset(): Promise<void> {
               )
             }}
           </k-block-title>
-          <k-list>
+          <k-list class="bg-black">
             <k-list-input
+              class="relative"
               :value="accountEmail"
-              :label="phone.t('Apps.mail.email')"
+              :label="
+                phone.t(
+                  accountMode === 'login'
+                    ? 'Apps.mail.email'
+                    : 'Apps.mail.localPart',
+                )
+              "
               outline
               floating-label
+              :input-class="accountMode === 'register' ? 'pr-20' : undefined"
               autocomplete="username"
               autocapitalize="none"
+              spellcheck="false"
+              :clear-button="accountMode === 'login'"
               @input="accountEmail = eventValue($event)"
-            />
+              @clear="accountEmail = ''"
+            >
+              <span
+                v-if="accountMode === 'register'"
+                class="pointer-events-none absolute right-8 top-1/2 -translate-y-1/2 text-sm opacity-50"
+              >
+                @ifruit.com
+              </span>
+            </k-list-input>
             <k-list-input
               type="password"
               :value="accountPassword"
               :label="phone.t('Apps.mail.password')"
               outline
               floating-label
+              autocomplete="current-password"
               @input="accountPassword = eventValue($event)"
-            />
+            >
+              <template #media><KeyRound :size="20" /></template>
+            </k-list-input>
             <k-list-input
               v-if="accountMode === 'register'"
               type="password"
@@ -451,18 +474,24 @@ async function confirmFactoryReset(): Promise<void> {
               :label="phone.t('Apps.mail.confirmPassword')"
               outline
               floating-label
+              autocomplete="new-password"
               @input="accountConfirm = eventValue($event)"
-            />
+            >
+              <template #media><KeyRound :size="20" /></template>
+            </k-list-input>
           </k-list>
           <k-block>
             <k-button large rounded :disabled="accountSubmitting" @click="submitAccount">
-              {{
-                phone.t(
-                  accountMode === 'login'
-                    ? 'Apps.mail.login'
-                    : 'Apps.mail.register',
-                )
-              }}
+              <k-preloader v-if="accountSubmitting" />
+              <template v-else>
+                {{
+                  phone.t(
+                    accountMode === 'login'
+                      ? 'Apps.mail.login'
+                      : 'Apps.mail.register',
+                  )
+                }}
+              </template>
             </k-button>
           </k-block>
           <k-list strong inset>
@@ -478,17 +507,6 @@ async function confirmFactoryReset(): Promise<void> {
               }}
             </k-list-button>
           </k-list>
-          <k-block-title>{{ phone.t('Apps.settings.deviceInformation') }}</k-block-title>
-          <k-list strong inset>
-            <k-list-item
-              :title="phone.t('Apps.settings.imei')"
-              :after="phone.device?.imei ?? '—'"
-            />
-            <k-list-button @click="resetOpened = true">
-              <RotateCcw :size="18" />
-              {{ phone.t('Apps.settings.factoryReset') }}
-            </k-list-button>
-          </k-list>
         </template>
 
         <template v-else>
@@ -503,14 +521,6 @@ async function confirmFactoryReset(): Promise<void> {
           </k-list-item>
           </k-list>
 
-          <k-block-title>{{ phone.t('Apps.settings.deviceInformation') }}</k-block-title>
-          <k-list strong inset>
-            <k-list-item
-              :title="phone.t('Apps.settings.imei')"
-              :after="phone.device?.imei ?? '—'"
-            />
-          </k-list>
-
           <k-block-title>{{ phone.t('Apps.settings.linkedDevices') }}</k-block-title>
           <k-list strong inset>
             <k-list-item
@@ -533,10 +543,6 @@ async function confirmFactoryReset(): Promise<void> {
             <k-list-button @click="logoutAccount">
               {{ phone.t('Apps.settings.signOut') }}
             </k-list-button>
-            <k-list-button @click="resetOpened = true">
-              <RotateCcw :size="18" />
-              {{ phone.t('Apps.settings.factoryReset') }}
-            </k-list-button>
           </k-list>
         </template>
       </template>
@@ -773,6 +779,18 @@ async function confirmFactoryReset(): Promise<void> {
             :after="phone.t('Apps.settings.localStorageValue')"
           />
         </k-list>
+
+        <k-block-title>{{ phone.t('Apps.settings.deviceInformation') }}</k-block-title>
+        <k-list strong inset>
+          <k-list-item
+            :title="phone.t('Apps.settings.imei')"
+            :after="phone.device?.imei ?? '—'"
+          />
+          <k-list-button @click="resetOpened = true">
+            <RotateCcw :size="18" />
+            {{ phone.t('Apps.settings.factoryReset') }}
+          </k-list-button>
+        </k-list>
       </template>
 
       <template v-else-if="activeView === 'appearance'">
diff --git a/sky_phone/config/locales/en.lua b/sky_phone/config/locales/en.lua
index 537fde4..acb97f1 100644
--- a/sky_phone/config/locales/en.lua
+++ b/sky_phone/config/locales/en.lua
@@ -118,7 +118,7 @@ Locales["en"] = {
                 name = "Settings", searchPlaceholder = "Search", airplaneMode = "Airplane Mode", streamerMode = "Streamer Mode",
                 wallpaper = "Wallpaper", on = "On", off = "Off", accountName = "iFruit Account",
                 accountDetail = "Cloud, Mail & Notes", accountLocalDetail = "Not signed in",
-                accountCloudDetail = "Mail and notes sync through iFruit Cloud", accountLoginBody = "Sign in is optional. This phone also works with local data only.",
+                accountCloudDetail = "Mail and notes sync through iFruit Cloud", accountLoginBody = "Sign in to keep your Mail and Notes. Without an iFruit Account, this data is lost with the phone.",
                 accountInformation = "Account Information", accountStatus = "Account Status", accountStatusValue = "Active",
                 accountStorage = "Cloud Storage", accountStorageValue = "On Device", accountPurchases = "Media & Purchases",
                 accountPurchasesValue = "Available", notifications = "Notifications", sounds = "Sounds & Haptics",
diff --git a/sky_phone/source/html/index.html b/sky_phone/source/html/index.html
index 9f60ce1..884ac27 100644
--- a/sky_phone/source/html/index.html
+++ b/sky_phone/source/html/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Sky Phone</title>
-    <script type="module" crossorigin src="./assets/sky-index-CN9A-zsO.js"></script>
+    <script type="module" crossorigin src="./assets/sky-index-Dr0lcFs7.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/sky-index-CFphfAe0.css">
   </head>
   <body>