diff --git a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
index b1f48437..8c0c9325 100644
--- a/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
+++ b/frontend/src/components/dialogs/auth/GitHubLoginDialog.tsx
@@ -8,6 +8,7 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { Button } from '@/components/ui/button';
+import { Alert } from '@/components/ui/alert';
 import { useUserSystem } from '@/components/config-provider';
 import { Check, Clipboard, Github } from 'lucide-react';
 import { Loader } from '@/components/ui/loader';
@@ -235,11 +236,7 @@ const GitHubLoginDialog = NiceModal.create(() => {
               </span>
             </div>
 
-            {error && (
-              <div className="p-3 bg-destructive/10 border border-destructive/20 rounded-lg">
-                <div className="text-destructive text-sm">{error}</div>
-              </div>
-            )}
+            {error && <Alert variant="destructive">{error}</Alert>}
 
             <DialogFooter>
               <Button
@@ -292,11 +289,7 @@ const GitHubLoginDialog = NiceModal.create(() => {
               </CardContent>
             </Card>
 
-            {error && (
-              <div className="p-3 bg-destructive/10 border border-destructive/20 rounded-lg">
-                <div className="text-destructive text-sm">{error}</div>
-              </div>
-            )}
+            {error && <Alert variant="destructive">{error}</Alert>}
 
             <DialogFooter className="gap-3 flex-col sm:flex-row">
               <Button
diff --git a/frontend/src/components/dialogs/tasks/CreatePRDialog.tsx b/frontend/src/components/dialogs/tasks/CreatePRDialog.tsx
index 30da7fea..6bf4dd8f 100644
--- a/frontend/src/components/dialogs/tasks/CreatePRDialog.tsx
+++ b/frontend/src/components/dialogs/tasks/CreatePRDialog.tsx
@@ -10,6 +10,7 @@ import { Label } from '@radix-ui/react-label';
 import { Textarea } from '@/components/ui/textarea.tsx';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
+import { Alert } from '@/components/ui/alert';
 import BranchSelector from '@/components/tasks/BranchSelector';
 import { useCallback, useEffect, useState } from 'react';
 import { attemptsApi } from '@/lib/api.ts';
@@ -70,6 +71,7 @@ const CreatePrDialog = NiceModal.create(() => {
   const handleConfirmCreatePR = useCallback(async () => {
     if (!data?.projectId || !data?.attempt.id) return;
 
+    setError(null);
     setCreatingPR(true);
 
     const result = await attemptsApi.createPR(data.attempt.id, {
@@ -166,11 +168,7 @@ const CreatePrDialog = NiceModal.create(() => {
                 }
               />
             </div>
-            {error && (
-              <div className="text-sm text-destructive bg-red-50 p-2 rounded">
-                {error}
-              </div>
-            )}
+            {error && <Alert variant="destructive">{error}</Alert>}
           </div>
           <DialogFooter>
             <Button variant="outline" onClick={handleCancelCreatePR}>
diff --git a/frontend/src/components/dialogs/tasks/TaskTemplateEditDialog.tsx b/frontend/src/components/dialogs/tasks/TaskTemplateEditDialog.tsx
index bb44c105..bb37a6f7 100644
--- a/frontend/src/components/dialogs/tasks/TaskTemplateEditDialog.tsx
+++ b/frontend/src/components/dialogs/tasks/TaskTemplateEditDialog.tsx
@@ -3,6 +3,7 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Textarea } from '@/components/ui/textarea';
+import { Alert } from '@/components/ui/alert';
 import {
   Dialog,
   DialogContent,
@@ -154,7 +155,7 @@ export const TaskTemplateEditDialog =
                   disabled={saving}
                 />
               </div>
-              {error && <div className="text-sm text-destructive">{error}</div>}
+              {error && <Alert variant="destructive">{error}</Alert>}
             </div>
             <DialogFooter>
               <Button