diff --git a/src/ui/Admin/AdminSettings.tsx b/src/ui/Admin/AdminSettings.tsx
index 8a7fe744..54cf46a0 100644
--- a/src/ui/Admin/AdminSettings.tsx
+++ b/src/ui/Admin/AdminSettings.tsx
@@ -27,6 +27,7 @@ import {
     deleteUser 
 } from "@/ui/main-axios.ts";
 import {useTranslation} from "react-i18next";
+import {toast} from "sonner";
 
 function getCookie(name: string) {
     return document.cookie.split('; ').reduce((r, v) => {
@@ -57,8 +58,6 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         scopes: 'openid email profile'
     });
     const [oidcLoading, setOidcLoading] = React.useState(false);
-    const [oidcError, setOidcError] = React.useState<string | null>(null);
-    const [oidcSuccess, setOidcSuccess] = React.useState<string | null>(null);
 
     const [users, setUsers] = React.useState<Array<{
         id: string;
@@ -69,8 +68,6 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
     const [usersLoading, setUsersLoading] = React.useState(false);
     const [newAdminUsername, setNewAdminUsername] = React.useState("");
     const [makeAdminLoading, setMakeAdminLoading] = React.useState(false);
-    const [makeAdminError, setMakeAdminError] = React.useState<string | null>(null);
-    const [makeAdminSuccess, setMakeAdminSuccess] = React.useState<string | null>(null);
 
     React.useEffect(() => {
         const jwt = getCookie("jwt");
@@ -121,13 +118,11 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
     const handleOIDCConfigSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
         setOidcLoading(true);
-        setOidcError(null);
-        setOidcSuccess(null);
 
         const required = ['client_id', 'client_secret', 'issuer_url', 'authorization_url', 'token_url'];
         const missing = required.filter(f => !oidcConfig[f as keyof typeof oidcConfig]);
         if (missing.length > 0) {
-            setOidcError(`Missing required fields: ${missing.join(', ')}`);
+            toast.error(`Missing required fields: ${missing.join(', ')}`);
             setOidcLoading(false);
             return;
         }
@@ -135,9 +130,9 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         const jwt = getCookie("jwt");
         try {
             await updateOIDCConfig(oidcConfig);
-            setOidcSuccess("OIDC configuration updated successfully!");
+            toast.success("OIDC configuration updated successfully!");
         } catch (err: any) {
-            setOidcError(err?.response?.data?.error || t('interface.failedToUpdateOidcConfig'));
+            toast.error(err?.response?.data?.error || t('interface.failedToUpdateOidcConfig'));
         } finally {
             setOidcLoading(false);
         }
@@ -147,42 +142,44 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
         setOidcConfig(prev => ({...prev, [field]: value}));
     };
 
-    const makeUserAdmin = async (e: React.FormEvent) => {
+    const handleMakeUserAdmin = async (e: React.FormEvent) => {
         e.preventDefault();
         if (!newAdminUsername.trim()) return;
         setMakeAdminLoading(true);
-        setMakeAdminError(null);
-        setMakeAdminSuccess(null);
         const jwt = getCookie("jwt");
         try {
             await makeUserAdmin(newAdminUsername.trim());
-            setMakeAdminSuccess(`User ${newAdminUsername} is now an admin`);
+            toast.success(`User ${newAdminUsername} is now an admin`);
             setNewAdminUsername("");
             fetchUsers();
         } catch (err: any) {
-            setMakeAdminError(err?.response?.data?.error || t('interface.failedToMakeUserAdmin'));
+            toast.error(err?.response?.data?.error || t('interface.failedToMakeUserAdmin'));
         } finally {
             setMakeAdminLoading(false);
         }
     };
 
-    const removeAdminStatus = async (username: string) => {
+    const handleRemoveAdminStatus = async (username: string) => {
         if (!confirm(`Remove admin status from ${username}?`)) return;
         const jwt = getCookie("jwt");
         try {
             await removeAdminStatus(username);
+            toast.success(`Admin status removed from ${username}`);
             fetchUsers();
-        } catch {
+        } catch (err: any) {
+            toast.error(err?.response?.data?.error || 'Failed to remove admin status');
         }
     };
 
-    const deleteUser = async (username: string) => {
+    const handleDeleteUser = async (username: string) => {
         if (!confirm(`Delete user ${username}? This cannot be undone.`)) return;
         const jwt = getCookie("jwt");
         try {
             await deleteUser(username);
+            toast.success(`User ${username} deleted successfully`);
             fetchUsers();
-        } catch {
+        } catch (err: any) {
+            toast.error(err?.response?.data?.error || 'Failed to delete user');
         }
     };
 
@@ -243,12 +240,6 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                 <h3 className="text-lg font-semibold">{t('admin.externalAuthentication')}</h3>
                                 <p className="text-sm text-muted-foreground">{t('admin.configureExternalProvider')}</p>
 
-                                {oidcError && (
-                                    <Alert variant="destructive">
-                                        <AlertTitle>{t('common.error')}</AlertTitle>
-                                        <AlertDescription>{oidcError}</AlertDescription>
-                                    </Alert>
-                                )}
 
                                 <form onSubmit={handleOIDCConfigSubmit} className="space-y-4">
                                     <div className="space-y-2">
@@ -315,12 +306,6 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                         })}>{t('admin.reset')}</Button>
                                     </div>
 
-                                    {oidcSuccess && (
-                                        <Alert>
-                                            <AlertTitle>{t('admin.success')}</AlertTitle>
-                                            <AlertDescription>{oidcSuccess}</AlertDescription>
-                                        </Alert>
-                                    )}
                                 </form>
                             </div>
                         </TabsContent>
@@ -358,7 +343,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                             className="px-4">{user.is_oidc ? t('admin.external') : t('admin.local')}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
-                                                                    onClick={() => deleteUser(user.username)}
+                                                                    onClick={() => handleDeleteUser(user.username)}
                                                                     className="text-red-600 hover:text-red-700 hover:bg-red-50"
                                                                     disabled={user.is_admin}>
                                                                 <Trash2 className="h-4 w-4"/>
@@ -378,7 +363,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                 <h3 className="text-lg font-semibold">{t('admin.adminManagement')}</h3>
                                 <div className="space-y-4 p-6 border rounded-md bg-muted/50">
                                     <h4 className="font-medium">{t('admin.makeUserAdmin')}</h4>
-                                    <form onSubmit={makeUserAdmin} className="space-y-4">
+                                    <form onSubmit={handleMakeUserAdmin} className="space-y-4">
                                         <div className="space-y-2">
                                             <Label htmlFor="new-admin-username">{t('admin.username')}</Label>
                                             <div className="flex gap-2">
@@ -389,18 +374,6 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                         disabled={makeAdminLoading || !newAdminUsername.trim()}>{makeAdminLoading ? t('admin.adding') : t('admin.makeAdmin')}</Button>
                                             </div>
                                         </div>
-                                        {makeAdminError && (
-                                            <Alert variant="destructive">
-                                                <AlertTitle>{t('common.error')}</AlertTitle>
-                                                <AlertDescription>{makeAdminError}</AlertDescription>
-                                            </Alert>
-                                        )}
-                                        {makeAdminSuccess && (
-                                            <Alert>
-                                                <AlertTitle>{t('admin.success')}</AlertTitle>
-                                                <AlertDescription>{makeAdminSuccess}</AlertDescription>
-                                            </Alert>
-                                        )}
                                     </form>
                                 </div>
 
@@ -427,7 +400,7 @@ export function AdminSettings({isTopbarOpen = true}: AdminSettingsProps): React.
                                                             className="px-4">{admin.is_oidc ? t('admin.external') : t('admin.local')}</TableCell>
                                                         <TableCell className="px-4">
                                                             <Button variant="ghost" size="sm"
-                                                                    onClick={() => removeAdminStatus(admin.username)}
+                                                                    onClick={() => handleRemoveAdminStatus(admin.username)}
                                                                     className="text-orange-600 hover:text-orange-700 hover:bg-orange-50">
                                                                 <Shield className="h-4 w-4"/>
                                                                 {t('admin.removeAdminButton')}
diff --git a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx b/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx
index d341ef16..2bd4bf0d 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx	
+++ b/src/ui/Apps/Host Manager/HostManagerHostEditor.tsx	
@@ -21,6 +21,7 @@ import React, {useEffect, useRef, useState} from "react";
 import {Switch} from "@/components/ui/switch.tsx";
 import {Alert, AlertDescription} from "@/components/ui/alert.tsx";
 import {createSSHHost, updateSSHHost, getSSHHosts} from '@/ui/main-axios.ts';
+import {toast} from "sonner";
 
 interface SSHHost {
     id: number;
@@ -255,8 +256,9 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
             }
 
             window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
+            toast.success(editingHost ? t('hosts.hostUpdated') : t('hosts.hostAdded'));
         } catch (error) {
-            alert(t('errors.saveError'));
+            toast.error(t('errors.saveError'));
         }
     };
 
diff --git a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx b/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx
index ae8d1281..6f11aac5 100644
--- a/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx	
+++ b/src/ui/Apps/Host Manager/HostManagerHostViewer.tsx	
@@ -8,6 +8,7 @@ import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from "@/co
 import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
 import {getSSHHosts, deleteSSHHost, bulkImportSSHHosts} from "@/ui/main-axios.ts";
 import {useTranslation} from "react-i18next";
+import {toast} from "sonner";
 import {
     Edit,
     Trash2,
@@ -78,8 +79,9 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
                 await deleteSSHHost(hostId);
                 await fetchHosts();
                 window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
+                toast.success(t('hosts.hostDeleted'));
             } catch (err) {
-                alert(t('hosts.failedToDeleteHost'));
+                toast.error(t('hosts.failedToDeleteHost'));
             }
         }
     };
@@ -116,16 +118,19 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
             const result = await bulkImportSSHHosts(hostsArray);
 
             if (result.success > 0) {
-                alert(t('hosts.importCompleted', { success: result.success, failed: result.failed }) + (result.errors.length > 0 ? '\n\nErrors:\n' + result.errors.join('\n') : ''));
+                toast.success(t('hosts.importCompleted', { success: result.success, failed: result.failed }));
+                if (result.errors.length > 0) {
+                    toast.error(`Errors: ${result.errors.join(', ')}`);
+                }
                 await fetchHosts();
                 window.dispatchEvent(new CustomEvent('ssh-hosts:changed'));
             } else {
-                alert(`${t('hosts.importFailed')}: ${result.errors.join('\n')}`);
+                toast.error(`${t('hosts.importFailed')}: ${result.errors.join(', ')}`);
             }
 
         } catch (err) {
             const errorMessage = err instanceof Error ? err.message : t('hosts.failedToImportJson');
-            alert(`${t('hosts.importError')}: ${errorMessage}`);
+            toast.error(`${t('hosts.importError')}: ${errorMessage}`);
         } finally {
             setImporting(false);
             event.target.value = '';
diff --git a/src/ui/User/PasswordReset.tsx b/src/ui/User/PasswordReset.tsx
index 7f111614..68d05593 100644
--- a/src/ui/User/PasswordReset.tsx
+++ b/src/ui/User/PasswordReset.tsx
@@ -7,6 +7,7 @@ import {Input} from "@/components/ui/input.tsx";
 import {Button} from "@/components/ui/button.tsx";
 import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert.tsx";
 import {useTranslation} from "react-i18next";
+import {toast} from "sonner";
 
 interface PasswordResetProps {
     userInfo: {
@@ -36,8 +37,11 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
             const result = await initiatePasswordReset(userInfo.username);
             setResetStep("verify");
             setError(null);
+            toast.success(t('auth.resetCodeSent'));
         } catch (err: any) {
-            setError(err?.response?.data?.error || err?.message || t('errors.failedPasswordReset'));
+            const errorMessage = err?.response?.data?.error || err?.message || t('errors.failedPasswordReset');
+            setError(errorMessage);
+            toast.error(errorMessage);
         } finally {
             setResetLoading(false);
         }
@@ -61,8 +65,11 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
             setTempToken(response.tempToken);
             setResetStep("newPassword");
             setError(null);
+            toast.success(t('auth.codeVerified'));
         } catch (err: any) {
-            setError(err?.response?.data?.error || t('errors.failedVerifyCode'));
+            const errorMessage = err?.response?.data?.error || t('errors.failedVerifyCode');
+            setError(errorMessage);
+            toast.error(errorMessage);
         } finally {
             setResetLoading(false);
         }
@@ -73,13 +80,17 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
         setResetLoading(true);
 
         if (newPassword !== confirmPassword) {
-            setError(t('errors.passwordMismatch'));
+            const errorMessage = t('errors.passwordMismatch');
+            setError(errorMessage);
+            toast.error(errorMessage);
             setResetLoading(false);
             return;
         }
 
         if (newPassword.length < 6) {
-            setError(t('errors.weakPassword'));
+            const errorMessage = t('errors.weakPassword');
+            setError(errorMessage);
+            toast.error(errorMessage);
             setResetLoading(false);
             return;
         }
@@ -95,8 +106,11 @@ export function PasswordReset({userInfo}: PasswordResetProps) {
             setError(null);
 
             setResetSuccess(true);
+            toast.success(t('auth.passwordResetSuccess'));
         } catch (err: any) {
-            setError(err?.response?.data?.error || t('errors.failedCompleteReset'));
+            const errorMessage = err?.response?.data?.error || t('errors.failedCompleteReset');
+            setError(errorMessage);
+            toast.error(errorMessage);
         } finally {
             setResetLoading(false);
         }