diff --git a/src/route-widgets/AliasesRoute/AliasesListItem.tsx b/src/route-widgets/AliasesRoute/AliasesListItem.tsx
index c1607ab..995687c 100644
--- a/src/route-widgets/AliasesRoute/AliasesListItem.tsx
+++ b/src/route-widgets/AliasesRoute/AliasesListItem.tsx
@@ -2,7 +2,13 @@ import {ReactElement} from "react"
 import {MdContentCopy} from "react-icons/md"
 import {Link as RouterLink} from "react-router-dom"
 
-import {ListItemButton, ListItemIcon, ListItemSecondaryAction, ListItemText} from "@mui/material"
+import {
+	ListItemButton,
+	ListItemIcon,
+	ListItemSecondaryAction,
+	ListItemText,
+	useTheme,
+} from "@mui/material"
 
 import {AliasTypeIndicator} from "~/components"
 import {AliasList} from "~/server-types"
@@ -15,6 +21,8 @@ export interface AliasesListItemProps {
 const getAddress = (alias: AliasList): string => `${alias.local}@${alias.domain}`
 
 export default function AliasesListItem({alias, onCopy}: AliasesListItemProps): ReactElement {
+	const theme = useTheme()
+
 	const isInCopyAddressMode = onCopy !== undefined
 	const address = getAddress(alias)
 
@@ -36,7 +44,14 @@ export default function AliasesListItem({alias, onCopy}: AliasesListItemProps):
 			<ListItemIcon>
 				<AliasTypeIndicator type={alias.type} />
 			</ListItemIcon>
-			<ListItemText primary={address} />
+			<ListItemText
+				primary={
+					<>
+						<span>{alias.local}</span>
+						<span style={{opacity: 0.5}}>@{alias.domain}</span>
+					</>
+				}
+			/>
 			{isInCopyAddressMode && (
 				<ListItemSecondaryAction>
 					<MdContentCopy />
diff --git a/src/routes/EnterDecryptionPassword.tsx b/src/routes/EnterDecryptionPassword.tsx
index 860bf2f..653d339 100644
--- a/src/routes/EnterDecryptionPassword.tsx
+++ b/src/routes/EnterDecryptionPassword.tsx
@@ -61,6 +61,7 @@ export default function EnterDecryptionPassword(): ReactElement {
 					<PasswordField
 						key="password"
 						fullWidth
+						autoFocus
 						name="password"
 						id="password"
 						label={t("components.EnterDecryptionPassword.form.password.label")}