diff --git a/console/package.json b/console/package.json
index 348354f5c..ca524c2b4 100644
--- a/console/package.json
+++ b/console/package.json
@@ -21,6 +21,7 @@
         "@microsoft/fetch-event-source": "^2.0.1",
         "@monaco-editor/react": "^4.7.0",
         "@popperjs/core": "^2.11.8",
+        "@radix-ui/react-alert-dialog": "^1.1.15",
         "@radix-ui/react-avatar": "^1.1.11",
         "@radix-ui/react-checkbox": "^1.3.3",
         "@radix-ui/react-collapsible": "^1.1.12",
diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml
index b046bf405..916b4c411 100644
--- a/console/pnpm-lock.yaml
+++ b/console/pnpm-lock.yaml
@@ -59,6 +59,9 @@ importers:
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
+      '@radix-ui/react-alert-dialog':
+        specifier: ^1.1.15
+        version: 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-avatar':
         specifier: ^1.1.11
         version: 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -1192,6 +1195,19 @@ packages:
   '@radix-ui/primitive@1.1.3':
     resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
 
+  '@radix-ui/react-alert-dialog@1.1.15':
+    resolution: {integrity: sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-arrow@1.1.7':
     resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==}
     peerDependencies:
@@ -2016,66 +2032,79 @@ packages:
     resolution: {integrity: sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.57.1':
     resolution: {integrity: sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.57.1':
     resolution: {integrity: sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.57.1':
     resolution: {integrity: sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.57.1':
     resolution: {integrity: sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-musl@4.57.1':
     resolution: {integrity: sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-ppc64-gnu@4.57.1':
     resolution: {integrity: sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-musl@4.57.1':
     resolution: {integrity: sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-gnu@4.57.1':
     resolution: {integrity: sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.57.1':
     resolution: {integrity: sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.57.1':
     resolution: {integrity: sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.57.1':
     resolution: {integrity: sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.57.1':
     resolution: {integrity: sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openbsd-x64@4.57.1':
     resolution: {integrity: sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==}
@@ -2157,24 +2186,28 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.1.18':
     resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.1.18':
     resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.1.18':
     resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.1.18':
     resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
@@ -4002,24 +4035,28 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.30.2:
     resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.30.2:
     resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.30.2:
     resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.30.2:
     resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
@@ -6395,6 +6432,20 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
+  '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.10)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.10)(react@18.3.1)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.10)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 19.2.10
+      '@types/react-dom': 19.2.3(@types/react@19.2.10)
+
   '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.10))(@types/react@19.2.10)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
diff --git a/console/public/templates/users.csv b/console/public/templates/users.csv
index 705171c0c..81bd17cec 100644
--- a/console/public/templates/users.csv
+++ b/console/public/templates/users.csv
@@ -1 +1,11 @@
-external_id,email,phone,timezone,locale
\ No newline at end of file
+external_id,email,phone,timezone,locale
+user-1,user1@example.com,+1234567890,Europe/Amsterdam,en
+user-2,user2@example.com,+1234567891,America/New_York,en
+user-3,user3@example.com,+1234567892,GMT+2,en
+user-4,user4@example.com,+1234567893,GMT-5,en
+user-5,user5@example.com,+1234567894,UTC+8,en
+user-6,user6@example.com,+1234567895,EST,en
+user-7,user7@example.com,+1234567896,PST,en
+user-8,user8@example.com,+1234567897,CET,en
+user-9,user9@example.com,+1234567898,IST,en
+user-10,user10@example.com,+1234567899,Asia/Tokyo,en
\ No newline at end of file
diff --git a/console/src/components/ui/alert-dialog.tsx b/console/src/components/ui/alert-dialog.tsx
new file mode 100644
index 000000000..73cb1f702
--- /dev/null
+++ b/console/src/components/ui/alert-dialog.tsx
@@ -0,0 +1,119 @@
+import * as React from "react"
+import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+
+import { cn } from "@/utils"
+import { buttonVariants } from "@/components/ui/button"
+
+const AlertDialog = AlertDialogPrimitive.Root
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal
+
+const AlertDialogOverlay = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPrimitive.Overlay
+        className={cn(
+            "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+            className,
+        )}
+        {...props}
+        ref={ref}
+    />
+))
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName
+
+const AlertDialogContent = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Content>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPortal>
+        <AlertDialogOverlay />
+        <AlertDialogPrimitive.Content
+            ref={ref}
+            className={cn(
+                "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 sm:rounded-lg",
+                className,
+            )}
+            {...props}
+        />
+    </AlertDialogPortal>
+))
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
+
+const AlertDialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+    <div className={cn("flex flex-col space-y-2 text-center sm:text-left", className)} {...props} />
+)
+AlertDialogHeader.displayName = "AlertDialogHeader"
+
+const AlertDialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+    <div
+        className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)}
+        {...props}
+    />
+)
+AlertDialogFooter.displayName = "AlertDialogFooter"
+
+const AlertDialogTitle = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Title>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPrimitive.Title
+        ref={ref}
+        className={cn("text-lg font-semibold", className)}
+        {...props}
+    />
+))
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
+
+const AlertDialogDescription = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Description>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPrimitive.Description
+        ref={ref}
+        className={cn("text-sm text-muted-foreground", className)}
+        {...props}
+    />
+))
+AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName
+
+const AlertDialogAction = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Action>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPrimitive.Action
+        ref={ref}
+        className={cn(buttonVariants(), className)}
+        {...props}
+    />
+))
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
+
+const AlertDialogCancel = React.forwardRef<
+    React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
+    React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({ className, ...props }, ref) => (
+    <AlertDialogPrimitive.Cancel
+        ref={ref}
+        className={cn(buttonVariants({ variant: "outline" }), "mt-2 sm:mt-0", className)}
+        {...props}
+    />
+))
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
+
+export {
+    AlertDialog,
+    AlertDialogPortal,
+    AlertDialogOverlay,
+    AlertDialogTrigger,
+    AlertDialogContent,
+    AlertDialogHeader,
+    AlertDialogFooter,
+    AlertDialogTitle,
+    AlertDialogDescription,
+    AlertDialogAction,
+    AlertDialogCancel,
+}
diff --git a/console/src/views/project/ProjectForm.tsx b/console/src/views/project/ProjectForm.tsx
index 586350a81..12c098fcc 100644
--- a/console/src/views/project/ProjectForm.tsx
+++ b/console/src/views/project/ProjectForm.tsx
@@ -2,6 +2,7 @@ import api from "../../api"
 import type { Project } from "../../types"
 import { useTranslation } from "react-i18next"
 import type { UseFormReturn } from "react-hook-form"
+import { useState } from "react"
 import { Controller, FormProvider, useForm } from "react-hook-form"
 import { Globe, MessageSquareText } from "lucide-react"
 
@@ -18,6 +19,15 @@ import {
     SelectValue,
 } from "@/components/ui/select"
 
+import {
+    AlertDialog,
+    AlertDialogAction,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+} from "@/components/ui/alert-dialog"
 import { Separator } from "@/components/ui/separator"
 import { LocalePicker } from "@/components/locale/picker"
 
@@ -58,6 +68,7 @@ export default function ProjectForm({ project, onSave }: ProjectFormProps) {
         timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         locale: browserLocale,
     }
+    const [saveError, setSaveError] = useState<string | null>(null)
     const form = useForm<Project>({
         defaultValues: defaults,
     })
@@ -87,248 +98,272 @@ export default function ProjectForm({ project, onSave }: ProjectFormProps) {
                 onSave?.(updatedProject)
             } catch (error) {
                 console.error("Failed to save project", error)
-                window.alert(t("project.saveError", "Unable to save project. Please try again."))
+                setSaveError(t("project.saveError", "Unable to save project. Please try again."))
             }
         },
     )
 
     const isEditing = !!project
     return (
-        <FormProvider {...form}>
-            <form onSubmit={handleSubmit} className="space-y-6">
-                {isEditing ? (
-                    <>
-                        {/* Project Details — settings page layout */}
-                        <section className="space-y-6">
-                            <div className="flex items-center gap-3">
-                                <div className="flex h-9 w-9 items-center justify-center rounded-lg bg-primary/10">
-                                    <Globe className="h-4 w-4 text-primary" />
-                                </div>
-                                <div>
-                                    <h3 className="font-semibold leading-none tracking-tight">
-                                        {t("project_details", "Project Details")}
-                                    </h3>
-                                    <p className="text-sm text-muted-foreground">
-                                        {t(
-                                            "project_details_description",
-                                            "Basic information about your project.",
-                                        )}
-                                    </p>
+        <AlertDialog open={!!saveError} onOpenChange={() => setSaveError(null)}>
+            <FormProvider {...form}>
+                <form onSubmit={handleSubmit} className="space-y-6">
+                    {isEditing ? (
+                        <>
+                            {/* Project Details — settings page layout */}
+                            <section className="space-y-6">
+                                <div className="flex items-center gap-3">
+                                    <div className="flex h-9 w-9 items-center justify-center rounded-lg bg-primary/10">
+                                        <Globe className="h-4 w-4 text-primary" />
+                                    </div>
+                                    <div>
+                                        <h3 className="font-semibold leading-none tracking-tight">
+                                            {t("project_details", "Project Details")}
+                                        </h3>
+                                        <p className="text-sm text-muted-foreground">
+                                            {t(
+                                                "project_details_description",
+                                                "Basic information about your project.",
+                                            )}
+                                        </p>
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div className="grid gap-6">
-                                <div className="grid gap-x-4 gap-y-2 sm:grid-cols-2">
-                                    <Label
-                                        htmlFor="name"
-                                        className="inline-flex items-center gap-1"
-                                    >
-                                        {t("name")} <span className="text-destructive">*</span>
-                                    </Label>
-                                    <Label className="inline-flex items-center gap-1">
-                                        {t("default_locale")}{" "}
-                                        <span className="text-destructive">*</span>
-                                    </Label>
+                                <div className="grid gap-6">
+                                    <div className="grid gap-x-4 gap-y-2 sm:grid-cols-2">
+                                        <Label
+                                            htmlFor="name"
+                                            className="inline-flex items-center gap-1"
+                                        >
+                                            {t("name")} <span className="text-destructive">*</span>
+                                        </Label>
+                                        <Label className="inline-flex items-center gap-1">
+                                            {t("default_locale")}{" "}
+                                            <span className="text-destructive">*</span>
+                                        </Label>
 
-                                    <Controller
-                                        control={form.control}
-                                        name="name"
-                                        rules={{ required: true }}
-                                        render={({ field }) => (
-                                            <Input
-                                                id="name"
-                                                type="text"
-                                                required
-                                                placeholder={t(
-                                                    "project_name_placeholder",
-                                                    "My Project",
-                                                )}
-                                                value={field.value ?? ""}
-                                                onChange={field.onChange}
-                                                onBlur={field.onBlur}
-                                                ref={field.ref}
-                                            />
-                                        )}
-                                    />
-                                    <Controller
-                                        control={form.control}
-                                        name="locale"
-                                        rules={{ required: true }}
-                                        render={({ field }) => (
-                                            <LocalePicker
-                                                value={field.value}
-                                                onChange={field.onChange}
-                                            />
-                                        )}
-                                    />
+                                        <Controller
+                                            control={form.control}
+                                            name="name"
+                                            rules={{ required: true }}
+                                            render={({ field }) => (
+                                                <Input
+                                                    id="name"
+                                                    type="text"
+                                                    required
+                                                    placeholder={t(
+                                                        "project_name_placeholder",
+                                                        "My Project",
+                                                    )}
+                                                    value={field.value ?? ""}
+                                                    onChange={field.onChange}
+                                                    onBlur={field.onBlur}
+                                                    ref={field.ref}
+                                                />
+                                            )}
+                                        />
+                                        <Controller
+                                            control={form.control}
+                                            name="locale"
+                                            rules={{ required: true }}
+                                            render={({ field }) => (
+                                                <LocalePicker
+                                                    value={field.value}
+                                                    onChange={field.onChange}
+                                                />
+                                            )}
+                                        />
 
-                                    <span />
-                                    <p className="text-xs text-muted-foreground">
-                                        {t("default_locale_description")}
-                                    </p>
-                                </div>
+                                        <span />
+                                        <p className="text-xs text-muted-foreground">
+                                            {t("default_locale_description")}
+                                        </p>
+                                    </div>
 
-                                <div className="grid gap-2">
-                                    <Label htmlFor="description">{t("description")}</Label>
-                                    <Controller
-                                        control={form.control}
-                                        name="description"
-                                        render={({ field }) => (
-                                            <Textarea
-                                                id="description"
-                                                placeholder={t(
-                                                    "project_description_placeholder",
-                                                    "A brief description of your project...",
-                                                )}
-                                                className="min-h-[80px] resize-none"
-                                                value={field.value ?? ""}
-                                                onChange={field.onChange}
-                                                onBlur={field.onBlur}
-                                                ref={field.ref}
-                                            />
-                                        )}
-                                    />
-                                </div>
+                                    <div className="grid gap-2">
+                                        <Label htmlFor="description">{t("description")}</Label>
+                                        <Controller
+                                            control={form.control}
+                                            name="description"
+                                            render={({ field }) => (
+                                                <Textarea
+                                                    id="description"
+                                                    placeholder={t(
+                                                        "project_description_placeholder",
+                                                        "A brief description of your project...",
+                                                    )}
+                                                    className="min-h-[80px] resize-none"
+                                                    value={field.value ?? ""}
+                                                    onChange={field.onChange}
+                                                    onBlur={field.onBlur}
+                                                    ref={field.ref}
+                                                />
+                                            )}
+                                        />
+                                    </div>
 
-                                <div className="grid gap-2 sm:max-w-sm">
-                                    <Label
-                                        htmlFor="timezone"
-                                        className="inline-flex items-center gap-1"
-                                    >
-                                        {t("timezone")} <span className="text-destructive">*</span>
-                                    </Label>
-                                    <Controller
-                                        control={form.control}
-                                        name="timezone"
-                                        rules={{ required: true }}
-                                        render={({ field }) => (
-                                            <Select
-                                                value={field.value}
-                                                onValueChange={field.onChange}
-                                            >
-                                                <SelectTrigger id="timezone">
-                                                    <SelectValue placeholder={t("timezone")} />
-                                                </SelectTrigger>
-                                                <SelectContent className="max-h-[300px]">
-                                                    <SelectGroup>
-                                                        {timeZones.map((tz) => (
-                                                            <SelectItem key={tz} value={tz}>
-                                                                {tz}
-                                                            </SelectItem>
-                                                        ))}
-                                                    </SelectGroup>
-                                                </SelectContent>
-                                            </Select>
-                                        )}
-                                    />
+                                    <div className="grid gap-2 sm:max-w-sm">
+                                        <Label
+                                            htmlFor="timezone"
+                                            className="inline-flex items-center gap-1"
+                                        >
+                                            {t("timezone")}{" "}
+                                            <span className="text-destructive">*</span>
+                                        </Label>
+                                        <Controller
+                                            control={form.control}
+                                            name="timezone"
+                                            rules={{ required: true }}
+                                            render={({ field }) => (
+                                                <Select
+                                                    value={field.value}
+                                                    onValueChange={field.onChange}
+                                                >
+                                                    <SelectTrigger id="timezone">
+                                                        <SelectValue placeholder={t("timezone")} />
+                                                    </SelectTrigger>
+                                                    <SelectContent className="max-h-[300px]">
+                                                        <SelectGroup>
+                                                            {timeZones.map((tz) => (
+                                                                <SelectItem key={tz} value={tz}>
+                                                                    {tz}
+                                                                </SelectItem>
+                                                            ))}
+                                                        </SelectGroup>
+                                                    </SelectContent>
+                                                </Select>
+                                            )}
+                                        />
+                                    </div>
                                 </div>
+                            </section>
+
+                            <ProjectSettingsFields form={form} />
+                        </>
+                    ) : (
+                        /* Onboarding / create project — simple stacked layout */
+                        <div className="grid gap-4">
+                            <div className="grid gap-2">
+                                <Label htmlFor="name" className="inline-flex items-center gap-1">
+                                    {t("name")} <span className="text-destructive">*</span>
+                                </Label>
+                                <Controller
+                                    control={form.control}
+                                    name="name"
+                                    rules={{ required: true }}
+                                    render={({ field }) => (
+                                        <Input
+                                            id="name"
+                                            type="text"
+                                            required
+                                            placeholder={t(
+                                                "project_name_placeholder",
+                                                "My Project",
+                                            )}
+                                            value={field.value ?? ""}
+                                            onChange={field.onChange}
+                                            onBlur={field.onBlur}
+                                            ref={field.ref}
+                                        />
+                                    )}
+                                />
                             </div>
-                        </section>
 
-                        <ProjectSettingsFields form={form} />
-                    </>
-                ) : (
-                    /* Onboarding / create project — simple stacked layout */
-                    <div className="grid gap-4">
-                        <div className="grid gap-2">
-                            <Label htmlFor="name" className="inline-flex items-center gap-1">
-                                {t("name")} <span className="text-destructive">*</span>
-                            </Label>
-                            <Controller
-                                control={form.control}
-                                name="name"
-                                rules={{ required: true }}
-                                render={({ field }) => (
-                                    <Input
-                                        id="name"
-                                        type="text"
-                                        required
-                                        placeholder={t("project_name_placeholder", "My Project")}
-                                        value={field.value ?? ""}
-                                        onChange={field.onChange}
-                                        onBlur={field.onBlur}
-                                        ref={field.ref}
-                                    />
-                                )}
-                            />
-                        </div>
+                            <div className="grid gap-2">
+                                <Label htmlFor="description">{t("description")}</Label>
+                                <Controller
+                                    control={form.control}
+                                    name="description"
+                                    render={({ field }) => (
+                                        <Textarea
+                                            id="description"
+                                            placeholder={t(
+                                                "project_description_placeholder",
+                                                "A brief description of your project...",
+                                            )}
+                                            className="min-h-[80px] resize-none"
+                                            value={field.value ?? ""}
+                                            onChange={field.onChange}
+                                            onBlur={field.onBlur}
+                                            ref={field.ref}
+                                        />
+                                    )}
+                                />
+                            </div>
 
-                        <div className="grid gap-2">
-                            <Label htmlFor="description">{t("description")}</Label>
-                            <Controller
-                                control={form.control}
-                                name="description"
-                                render={({ field }) => (
-                                    <Textarea
-                                        id="description"
-                                        placeholder={t(
-                                            "project_description_placeholder",
-                                            "A brief description of your project...",
-                                        )}
-                                        className="min-h-[80px] resize-none"
-                                        value={field.value ?? ""}
-                                        onChange={field.onChange}
-                                        onBlur={field.onBlur}
-                                        ref={field.ref}
-                                    />
-                                )}
-                            />
-                        </div>
+                            <div className="grid gap-2">
+                                <Label className="inline-flex items-center gap-1">
+                                    {t("default_locale")}{" "}
+                                    <span className="text-destructive">*</span>
+                                </Label>
+                                <Controller
+                                    control={form.control}
+                                    name="locale"
+                                    rules={{ required: true }}
+                                    render={({ field }) => (
+                                        <LocalePicker
+                                            value={field.value}
+                                            onChange={field.onChange}
+                                        />
+                                    )}
+                                />
+                                <p className="text-xs text-muted-foreground">
+                                    {t("default_locale_description")}
+                                </p>
+                            </div>
 
-                        <div className="grid gap-2">
-                            <Label className="inline-flex items-center gap-1">
-                                {t("default_locale")} <span className="text-destructive">*</span>
-                            </Label>
-                            <Controller
-                                control={form.control}
-                                name="locale"
-                                rules={{ required: true }}
-                                render={({ field }) => (
-                                    <LocalePicker value={field.value} onChange={field.onChange} />
-                                )}
-                            />
-                            <p className="text-xs text-muted-foreground">
-                                {t("default_locale_description")}
-                            </p>
+                            <div className="grid gap-2">
+                                <Label
+                                    htmlFor="timezone"
+                                    className="inline-flex items-center gap-1"
+                                >
+                                    {t("timezone")} <span className="text-destructive">*</span>
+                                </Label>
+                                <Controller
+                                    control={form.control}
+                                    name="timezone"
+                                    rules={{ required: true }}
+                                    render={({ field }) => (
+                                        <Select value={field.value} onValueChange={field.onChange}>
+                                            <SelectTrigger id="timezone">
+                                                <SelectValue placeholder={t("timezone")} />
+                                            </SelectTrigger>
+                                            <SelectContent className="max-h-[300px]">
+                                                <SelectGroup>
+                                                    {timeZones.map((tz) => (
+                                                        <SelectItem key={tz} value={tz}>
+                                                            {tz}
+                                                        </SelectItem>
+                                                    ))}
+                                                </SelectGroup>
+                                            </SelectContent>
+                                        </Select>
+                                    )}
+                                />
+                            </div>
                         </div>
+                    )}
 
-                        <div className="grid gap-2">
-                            <Label htmlFor="timezone" className="inline-flex items-center gap-1">
-                                {t("timezone")} <span className="text-destructive">*</span>
-                            </Label>
-                            <Controller
-                                control={form.control}
-                                name="timezone"
-                                rules={{ required: true }}
-                                render={({ field }) => (
-                                    <Select value={field.value} onValueChange={field.onChange}>
-                                        <SelectTrigger id="timezone">
-                                            <SelectValue placeholder={t("timezone")} />
-                                        </SelectTrigger>
-                                        <SelectContent className="max-h-[300px]">
-                                            <SelectGroup>
-                                                {timeZones.map((tz) => (
-                                                    <SelectItem key={tz} value={tz}>
-                                                        {tz}
-                                                    </SelectItem>
-                                                ))}
-                                            </SelectGroup>
-                                        </SelectContent>
-                                    </Select>
-                                )}
-                            />
-                        </div>
+                    {/* Save */}
+                    <div className="flex items-center justify-end">
+                        <Button type="submit" disabled={form.formState.isSubmitting}>
+                            {isEditing ? t("save") : t("create_project")}
+                        </Button>
                     </div>
-                )}
-
-                {/* Save */}
-                <div className="flex items-center justify-end">
-                    <Button type="submit" disabled={form.formState.isSubmitting}>
-                        {isEditing ? t("save") : t("create_project")}
-                    </Button>
-                </div>
-            </form>
-        </FormProvider>
+                </form>
+            </FormProvider>
+            <AlertDialogContent>
+                <AlertDialogHeader>
+                    <AlertDialogTitle>{t("error")}</AlertDialogTitle>
+                    <AlertDialogDescription>{saveError}</AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                    <AlertDialogAction onClick={() => setSaveError(null)}>
+                        {t("ok", "OK")}
+                    </AlertDialogAction>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
     )
 }
 
diff --git a/console/src/views/users/Users.tsx b/console/src/views/users/Users.tsx
index cf147a69c..dc51903cc 100644
--- a/console/src/views/users/Users.tsx
+++ b/console/src/views/users/Users.tsx
@@ -11,12 +11,13 @@ import {
     Upload,
     Mail,
     Database,
+    Check,
 } from "lucide-react"
 import { UserImportDialog } from "@/components/ui/user-import-dialog"
 import { NIL } from "uuid"
 import { useRoute } from "@/hooks/use-route"
 import { useResolver } from "../../hooks"
-import { formatDate } from "../../utils"
+import { formatDate, cn } from "../../utils"
 import { getRandomColor } from "@/lib/colors"
 import { getUserDisplayName, getUserInitials, getPrimaryExternalId } from "@/lib/name"
 import { PreferencesContext } from "@/contexts/PreferencesContext"
@@ -45,6 +46,15 @@ import {
 } from "@/components/ui/dialog"
 import { Label } from "@/components/ui/label"
 import { Skeleton } from "@/components/ui/skeleton"
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
+import {
+    Command,
+    CommandEmpty,
+    CommandGroup,
+    CommandInput,
+    CommandItem,
+    CommandList,
+} from "@/components/ui/command"
 import { AttributeEditor } from "@/components/ui/attribute-editor"
 import { LocalePicker } from "@/components/locale/picker"
 
@@ -86,6 +96,7 @@ export default function Users() {
     const [newUserExternalId, setNewUserExternalId] = useState("")
     const [newUserEmail, setNewUserEmail] = useState("")
     const [newUserPhone, setNewUserPhone] = useState("")
+    const [isNewUserTimezoneOpen, setIsNewUserTimezoneOpen] = useState(false)
     const [newUserTimezone, setNewUserTimezone] = useState(
         () => Intl.DateTimeFormat().resolvedOptions().timeZone,
     )
@@ -449,13 +460,50 @@ export default function Users() {
                         </div>
                         <div className="grid sm:grid-cols-2 gap-4">
                             <div className="grid gap-2 content-start">
-                                <Label htmlFor="timezone">{t("timezone")}</Label>
-                                <Input
-                                    id="timezone"
-                                    placeholder={t("enter_timezone", "e.g., America/New_York")}
-                                    value={newUserTimezone}
-                                    onChange={(e) => setNewUserTimezone(e.target.value)}
-                                />
+                                <Label>{t("timezone")}</Label>
+                                <Popover open={isNewUserTimezoneOpen} onOpenChange={setIsNewUserTimezoneOpen}>
+                                    <PopoverTrigger asChild>
+                                        <Button
+                                            variant="outline"
+                                            role="combobox"
+                                            className="justify-between"
+                                        >
+                                            {newUserTimezone || t("select_timezone", "Select timezone")}
+                                        </Button>
+                                    </PopoverTrigger>
+                                    <PopoverContent className="w-72 p-0" align="start">
+                                        <Command>
+                                            <CommandInput placeholder={t("search_timezone", "Search timezone...")} />
+                                            <CommandList>
+                                                <CommandEmpty>
+                                                    {t("no_timezone_found", "No timezone found.")}
+                                                </CommandEmpty>
+                                                <CommandGroup>
+                                                    {Intl.supportedValuesOf("timeZone").map((tz) => (
+                                                        <CommandItem
+                                                            key={tz}
+                                                            value={tz}
+                                                            onSelect={() => {
+                                                                setNewUserTimezone(tz)
+                                                                setIsNewUserTimezoneOpen(false)
+                                                            }}
+                                                        >
+                                                            <Check
+                                                                className={cn(
+                                                                    "mr-2 h-4 w-4",
+                                                                    newUserTimezone === tz
+                                                                        ? "opacity-100"
+                                                                        : "opacity-0",
+                                                                )}
+                                                            />
+                                                            {tz}
+                                                        </CommandItem>
+                                                    ))}
+                                                </CommandGroup>
+                                            </CommandList>
+                                        </Command>
+                                    </PopoverContent>
+                                </Popover>
                             </div>
                             <div className="grid gap-2 content-start">
                                 <Label>{t("locale.singular")}</Label>
diff --git a/docs/content/docs/lists.mdx b/docs/content/docs/lists.mdx
index 1a43ec815..8e9da8f94 100644
--- a/docs/content/docs/lists.mdx
+++ b/docs/content/docs/lists.mdx
@@ -137,6 +137,14 @@ user_003,carol@example.com,Carol,Initech,organic
 
 All other columns become custom properties on the user.
 
+<Callout type="info">
+  **Timezone auto-conversion**: Values in the `timezone` column are automatically
+  resolved to IANA timezone names. Abbreviations like `EST`, `PST`, `CET` and
+  GMT/UTC offsets like `GMT-5` or `+02:00` are converted to their IANA equivalents
+  (e.g., `America/New_York`, `America/Los_Angeles`). IANA names like
+  `America/New_York` are used as-is.
+</Callout>
+
 ### Updating via API
 
 For newsletter signups or other integrations, use the Admin API to add users to a static list:
diff --git a/docs/content/docs/users.mdx b/docs/content/docs/users.mdx
index 1a7c09ceb..30c68e586 100644
--- a/docs/content/docs/users.mdx
+++ b/docs/content/docs/users.mdx
@@ -266,6 +266,14 @@ The `identifier` column is required and is used as the `external_id` with the `d
 
 All other columns (like `plan` and `company` above) become custom properties.
 
+<Callout type="info">
+  **Timezone auto-conversion**: Values in the `timezone` column are automatically
+  resolved to IANA timezone names. Abbreviations like `EST`, `PST`, `CET` and
+  GMT/UTC offsets like `GMT-5` or `+02:00` are converted to their IANA equivalents
+  (e.g., `America/New_York`, `America/Los_Angeles`). IANA names like
+  `America/New_York` are used as-is.
+</Callout>
+
 <Callout type="info">
   Importing via a [static list](/lists#static-lists) also creates users, but
   adds them to the list. Direct CSV imports only create or update profiles.
diff --git a/go.mod b/go.mod
index 326f96df9..4fefd5665 100644
--- a/go.mod
+++ b/go.mod
@@ -309,6 +309,7 @@ require (
 	github.com/timonwong/loggercheck v0.10.1 // indirect
 	github.com/tklauser/go-sysconf v0.3.13 // indirect
 	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/tkuchiki/go-timezone v0.2.3 // indirect
 	github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
 	github.com/ultraware/funlen v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index 8889c4329..3d3366613 100644
--- a/go.sum
+++ b/go.sum
@@ -793,6 +793,8 @@ github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08
 github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
 github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
 github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
+github.com/tkuchiki/go-timezone v0.2.3 h1:D3TVdIPrFsu9lxGxqNX2wsZwn1MZtTqTW0mdevMozHc=
+github.com/tkuchiki/go-timezone v0.2.3/go.mod h1:oFweWxYl35C/s7HMVZXiA19Jr9Y0qJHMaG/J2TES4LY=
 github.com/tomarrell/wrapcheck/v2 v2.10.0 h1:SzRCryzy4IrAH7bVGG4cK40tNUhmVmMDuJujy4XwYDg=
 github.com/tomarrell/wrapcheck/v2 v2.10.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
diff --git a/internal/http/controllers/v1/management/test/users/out-of-order.csv b/internal/http/controllers/v1/management/test/users/out-of-order.csv
index 5d1a0fe6d..ace6e0243 100644
--- a/internal/http/controllers/v1/management/test/users/out-of-order.csv
+++ b/internal/http/controllers/v1/management/test/users/out-of-order.csv
@@ -1,4 +1,4 @@
 email,phone,timezone,locale,external_id
-user1@example.com,+1234567890,UTC,en,user-1
-user2@example.com,+1234567891,UTC,en,user-2
-user3@example.com,+1234567892,UTC,en,user-3
+user1@example.com,+1234567890,GMT+2,en,user-1
+user2@example.com,+1234567891,UTC-5,en,user-2
+user3@example.com,+1234567892,PST,en,user-3
\ No newline at end of file
diff --git a/internal/http/controllers/v1/management/test/users/valid.csv b/internal/http/controllers/v1/management/test/users/valid.csv
index e6e93ca0a..a03f50e11 100644
--- a/internal/http/controllers/v1/management/test/users/valid.csv
+++ b/internal/http/controllers/v1/management/test/users/valid.csv
@@ -1,4 +1,4 @@
 external_id,email,phone,timezone,locale
-user-1,user1@example.com,+1234567890,UTC,en
-user-2,user2@example.com,+1234567891,UTC,en
-user-3,user3@example.com,+1234567892,UTC,en
+user-1,user1@example.com,+1234567890,Europe/Amsterdam,en
+user-2,user2@example.com,+1234567891,GMT-5,en
+user-3,user3@example.com,+1234567892,EST,en
\ No newline at end of file
diff --git a/internal/importer/users.go b/internal/importer/users.go
index 5633a8860..003048c48 100644
--- a/internal/importer/users.go
+++ b/internal/importer/users.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"strings"
 
+	"github.com/lunogram/platform/internal/pkg/timezone"
 	"github.com/lunogram/platform/internal/store/subjects"
 )
 
@@ -13,10 +14,16 @@ var UserFieldMap = map[string]func(*subjects.UpsertUserParams, string){
 	"external_id": func(u *subjects.UpsertUserParams, v string) {
 		u.Identifiers = append(u.Identifiers, subjects.ExternalIDParam{Source: "default", ExternalID: v})
 	},
-	"email":    func(u *subjects.UpsertUserParams, v string) { u.Email = &v },
-	"phone":    func(u *subjects.UpsertUserParams, v string) { u.Phone = &v },
-	"timezone": func(u *subjects.UpsertUserParams, v string) { u.Timezone = &v },
-	"locale":   func(u *subjects.UpsertUserParams, v string) { u.Locale = &v },
+	"email": func(u *subjects.UpsertUserParams, v string) { u.Email = &v },
+	"phone": func(u *subjects.UpsertUserParams, v string) { u.Phone = &v },
+	"timezone": func(u *subjects.UpsertUserParams, v string) {
+		if resolved, err := timezone.Resolve(v); err == nil {
+			u.Timezone = &resolved
+		} else {
+			u.Timezone = &v
+		}
+	},
+	"locale": func(u *subjects.UpsertUserParams, v string) { u.Locale = &v },
 }
 
 func NewUsers(headers []string) (*UserMapper, error) {
diff --git a/internal/importer/users_test.go b/internal/importer/users_test.go
index 82e614487..94babf6d1 100644
--- a/internal/importer/users_test.go
+++ b/internal/importer/users_test.go
@@ -153,6 +153,26 @@ func TestUserMapperMapRecord(t *testing.T) {
 				require.Empty(t, user.Data)
 			},
 		},
+		"timezone GMT offset conversion": {
+			headers: []string{"external_id", "timezone"},
+			record:  []string{"user-gmt", "GMT+2"},
+			validate: func(t *testing.T, user subjects.UpsertUserParams) {
+				require.Len(t, user.Identifiers, 1)
+				require.Equal(t, "user-gmt", user.Identifiers[0].ExternalID)
+				require.NotNil(t, user.Timezone)
+				require.Equal(t, "Europe/Amsterdam", *user.Timezone)
+			},
+		},
+		"timezone IANA passthrough": {
+			headers: []string{"external_id", "timezone"},
+			record:  []string{"user-iana", "America/New_York"},
+			validate: func(t *testing.T, user subjects.UpsertUserParams) {
+				require.Len(t, user.Identifiers, 1)
+				require.Equal(t, "user-iana", user.Identifiers[0].ExternalID)
+				require.NotNil(t, user.Timezone)
+				require.Equal(t, "America/New_York", *user.Timezone)
+			},
+		},
 		"empty values": {
 			headers: []string{"external_id", "email", "phone"},
 			record:  []string{"user-empty", "", ""},
diff --git a/internal/pkg/timezone/resolver.go b/internal/pkg/timezone/resolver.go
new file mode 100644
index 000000000..79e3ebd68
--- /dev/null
+++ b/internal/pkg/timezone/resolver.go
@@ -0,0 +1,196 @@
+package timezone
+
+import (
+	"fmt"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	gotz "github.com/tkuchiki/go-timezone"
+)
+
+var offsetOverride = map[int]string{
+	0:      "Europe/London",
+	3600:   "Europe/Paris",
+	7200:   "Europe/Amsterdam",
+	10800:  "Europe/Moscow",
+	14400:  "Asia/Dubai",
+	18000:  "Asia/Karachi",
+	21600:  "Asia/Dhaka",
+	25200:  "Asia/Bangkok",
+	28800:  "Asia/Shanghai",
+	32400:  "Asia/Tokyo",
+	36000:  "Australia/Sydney",
+	39600:  "Pacific/Noumea",
+	43200:  "Pacific/Auckland",
+	-3600:  "Atlantic/Azores",
+	-7200:  "Etc/GMT+2",
+	-10800: "America/Sao_Paulo",
+	-14400: "America/Halifax",
+	-18000: "America/New_York",
+	-21600: "America/Chicago",
+	-25200: "America/Denver",
+	-28800: "America/Los_Angeles",
+	-32400: "America/Anchorage",
+	-36000: "Pacific/Honolulu",
+	-39600: "Pacific/Pago_Pago",
+	-43200: "Etc/GMT+12",
+	-34200: "Pacific/Marquesas",
+	-16200: "America/Caracas",
+	-12600: "America/St_Johns",
+	12600:  "Asia/Tehran",
+	16200:  "Asia/Kabul",
+	19800:  "Asia/Kolkata",
+	20700:  "Asia/Kathmandu",
+	23400:  "Asia/Yangon",
+	31500:  "Australia/Eucla",
+	34200:  "Australia/Darwin",
+	37800:  "Australia/Lord_Howe",
+	45900:  "Pacific/Chatham",
+}
+
+var abbrMap = map[string]string{
+	"est":  "America/New_York",
+	"edt":  "America/New_York",
+	"cst":  "America/Chicago",
+	"cdt":  "America/Chicago",
+	"mst":  "America/Denver",
+	"mdt":  "America/Denver",
+	"pst":  "America/Los_Angeles",
+	"pdt":  "America/Los_Angeles",
+	"cet":  "Europe/Paris",
+	"cest": "Europe/Paris",
+	"eet":  "Europe/Helsinki",
+	"eest": "Europe/Helsinki",
+	"bst":  "Europe/London",
+	"ist":  "Asia/Kolkata",
+	"jst":  "Asia/Tokyo",
+	"aest": "Australia/Sydney",
+	"aedt": "Australia/Sydney",
+	"awst": "Australia/Perth",
+	"nzst": "Pacific/Auckland",
+	"nzdt": "Pacific/Auckland",
+	"hst":  "Pacific/Honolulu",
+	"akst": "America/Anchorage",
+	"akdt": "America/Anchorage",
+	"wet":  "Europe/Lisbon",
+	"west": "Europe/Lisbon",
+	"cat":  "Africa/Harare",
+	"eat":  "Africa/Nairobi",
+	"wat":  "Africa/Lagos",
+	"sast": "Africa/Johannesburg",
+}
+
+var offsetToIANA map[int]string
+
+func init() {
+	tz := gotz.New()
+	offsetToIANA = make(map[int]string, len(tz.TzInfos())+len(offsetOverride))
+
+	for k, v := range offsetOverride {
+		offsetToIANA[k] = v
+	}
+
+	names := make([]string, 0, len(tz.TzInfos()))
+	for name := range tz.TzInfos() {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+
+	for _, name := range names {
+		info := tz.TzInfos()[name]
+		if info.IsDeprecated() {
+			continue
+		}
+		for _, off := range []int{info.StandardOffset(), info.DaylightOffset()} {
+			if _, exists := offsetToIANA[off]; !exists {
+				offsetToIANA[off] = name
+			}
+		}
+	}
+}
+
+var (
+	gmtPrefix       = regexp.MustCompile(`^(?i)(?:GMT|UTC|UT)\s*`)
+	offsetWithColon = regexp.MustCompile(`^([+-])(\d{1,2}):(\d{2})$`)
+	offsetFlat      = regexp.MustCompile(`^([+-])(\d{2})(\d{2})$`)
+	offsetHoursOnly = regexp.MustCompile(`^([+-])(\d{1,2})$`)
+)
+
+func Resolve(tz string) (string, error) {
+	normalized := strings.TrimSpace(tz)
+	if normalized == "" {
+		return "", fmt.Errorf("timezone: empty string")
+	}
+
+	lower := strings.ToLower(normalized)
+
+	if mapped, ok := abbrMap[lower]; ok {
+		return mapped, nil
+	}
+
+	stripped := gmtPrefix.ReplaceAllString(normalized, "")
+	if stripped != normalized {
+		if resolved, ok := tryParseOffset(stripped); ok {
+			return resolved, nil
+		}
+	}
+
+	if resolved, ok := tryParseOffset(normalized); ok {
+		return resolved, nil
+	}
+
+	_, err := time.LoadLocation(normalized)
+	if err == nil {
+		return normalized, nil
+	}
+
+	return "", fmt.Errorf("timezone: unable to resolve %q", tz)
+}
+
+func tryParseOffset(s string) (string, bool) {
+	m := offsetWithColon.FindStringSubmatch(s)
+	if m != nil {
+		return lookupOffset(m[1], m[2], m[3])
+	}
+
+	m = offsetFlat.FindStringSubmatch(s)
+	if m != nil {
+		return lookupOffset(m[1], m[2], m[3])
+	}
+
+	m = offsetHoursOnly.FindStringSubmatch(s)
+	if m != nil {
+		return lookupOffset(m[1], m[2], "")
+	}
+
+	return "", false
+}
+
+func lookupOffset(sign, hoursStr, minutesStr string) (string, bool) {
+	hours, err := strconv.Atoi(hoursStr)
+	if err != nil {
+		return "", false
+	}
+
+	minutes := 0
+	if minutesStr != "" {
+		minutes, err = strconv.Atoi(minutesStr)
+		if err != nil {
+			return "", false
+		}
+	}
+
+	totalSeconds := (hours*60 + minutes) * 60
+	if sign == "-" {
+		totalSeconds = -totalSeconds
+	}
+
+	mapped, ok := offsetToIANA[totalSeconds]
+	if !ok {
+		return "", false
+	}
+	return mapped, true
+}
diff --git a/internal/pkg/timezone/resolver_test.go b/internal/pkg/timezone/resolver_test.go
new file mode 100644
index 000000000..3243cd658
--- /dev/null
+++ b/internal/pkg/timezone/resolver_test.go
@@ -0,0 +1,225 @@
+package timezone
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestResolveIANAPassthrough(t *testing.T) {
+	tests := []string{
+		"Europe/Amsterdam",
+		"America/New_York",
+		"Asia/Tokyo",
+		"Australia/Sydney",
+		"UTC",
+		"Europe/London",
+		"Pacific/Auckland",
+	}
+
+	for _, tz := range tests {
+		t.Run(tz, func(t *testing.T) {
+			resolved, err := Resolve(tz)
+			require.NoError(t, err)
+			require.Equal(t, tz, resolved)
+		})
+	}
+}
+
+func TestResolveAliases(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"EST", "America/New_York"},
+		{"EDT", "America/New_York"},
+		{"CST", "America/Chicago"},
+		{"CDT", "America/Chicago"},
+		{"MST", "America/Denver"},
+		{"MDT", "America/Denver"},
+		{"PST", "America/Los_Angeles"},
+		{"PDT", "America/Los_Angeles"},
+		{"CET", "Europe/Paris"},
+		{"CEST", "Europe/Paris"},
+		{"BST", "Europe/London"},
+		{"IST", "Asia/Kolkata"},
+		{"JST", "Asia/Tokyo"},
+		{"AEST", "Australia/Sydney"},
+		{"HST", "Pacific/Honolulu"},
+		{"AKST", "America/Anchorage"},
+		{"WET", "Europe/Lisbon"},
+		{"CAT", "Africa/Harare"},
+		{"EAT", "Africa/Nairobi"},
+		{"SAST", "Africa/Johannesburg"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveGMTOffsets(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"GMT+2", "Europe/Amsterdam"},
+		{"GMT-5", "America/New_York"},
+		{"GMT+8", "Asia/Shanghai"},
+		{"GMT-8", "America/Los_Angeles"},
+		{"GMT+0", "Europe/London"},
+		{"GMT+1", "Europe/Paris"},
+		{"GMT+3", "Europe/Moscow"},
+		{"GMT+12", "Pacific/Auckland"},
+		{"GMT-11", "Pacific/Pago_Pago"},
+		{"GMT-10", "Pacific/Honolulu"},
+		{"GMT-9", "America/Anchorage"},
+		{"GMT-7", "America/Denver"},
+		{"GMT-6", "America/Chicago"},
+		{"GMT-4", "America/Halifax"},
+		{"GMT-3", "America/Sao_Paulo"},
+		{"GMT-2", "Etc/GMT+2"},
+		{"GMT-1", "Atlantic/Azores"},
+		{"GMT+4", "Asia/Dubai"},
+		{"GMT+5", "Asia/Karachi"},
+		{"GMT+6", "Asia/Dhaka"},
+		{"GMT+7", "Asia/Bangkok"},
+		{"GMT+9", "Asia/Tokyo"},
+		{"GMT+10", "Australia/Sydney"},
+		{"GMT+11", "Pacific/Noumea"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveUTCOffsets(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"UTC+2", "Europe/Amsterdam"},
+		{"UTC-5", "America/New_York"},
+		{"UTC+8", "Asia/Shanghai"},
+		{"UTC+0", "Europe/London"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveFormattedOffsets(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"+2", "Europe/Amsterdam"},
+		{"-5", "America/New_York"},
+		{"+0200", "Europe/Amsterdam"},
+		{"-0500", "America/New_York"},
+		{"+02:00", "Europe/Amsterdam"},
+		{"-05:00", "America/New_York"},
+		{"GMT+02:00", "Europe/Amsterdam"},
+		{"UTC+02:00", "Europe/Amsterdam"},
+		{"GMT+0200", "Europe/Amsterdam"},
+		{"UTC-0500", "America/New_York"},
+		{"UT+2", "Europe/Amsterdam"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveHalfHourOffsets(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"GMT+5:30", "Asia/Kolkata"},
+		{"GMT+3:30", "Asia/Tehran"},
+		{"GMT+4:30", "Asia/Kabul"},
+		{"GMT+6:30", "Asia/Yangon"},
+		{"GMT+9:30", "Australia/Darwin"},
+		{"GMT+5:45", "Asia/Kathmandu"},
+		{"GMT-3:30", "America/St_Johns"},
+		{"GMT-4:30", "America/Caracas"},
+		{"GMT-9:30", "Pacific/Marquesas"},
+		{"+5:30", "Asia/Kolkata"},
+		{"+0530", "Asia/Kolkata"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveCaseInsensitive(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+	}{
+		{"gmt+2", "Europe/Amsterdam"},
+		{"gmt-5", "America/New_York"},
+		{"Gmt+2", "Europe/Amsterdam"},
+		{"est", "America/New_York"},
+		{"Est", "America/New_York"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.input, func(t *testing.T) {
+			resolved, err := Resolve(tt.input)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, resolved)
+		})
+	}
+}
+
+func TestResolveInvalid(t *testing.T) {
+	tests := []string{
+		"",
+		"NotATimezone",
+		"Foobar/Unknown",
+		"GMT+X",
+		"++2",
+	}
+
+	for _, tt := range tests {
+		t.Run(tt, func(t *testing.T) {
+			_, err := Resolve(tt)
+			require.Error(t, err)
+		})
+	}
+}
+
+func TestResolveWithWhitespace(t *testing.T) {
+	resolved, err := Resolve("  GMT+2  ")
+	require.NoError(t, err)
+	require.Equal(t, "Europe/Amsterdam", resolved)
+
+	resolved, err = Resolve("  Europe/Amsterdam  ")
+	require.NoError(t, err)
+	require.Equal(t, "Europe/Amsterdam", resolved)
+}
diff --git a/internal/wasm/test/action.wasm b/internal/wasm/test/action.wasm
index f04e3f6f8..66e2a6440 100644
Binary files a/internal/wasm/test/action.wasm and b/internal/wasm/test/action.wasm differ
diff --git a/internal/wasm/test/provider.wasm b/internal/wasm/test/provider.wasm
index 5647cdb8f..0b072455d 100644
Binary files a/internal/wasm/test/provider.wasm and b/internal/wasm/test/provider.wasm differ