diff --git a/frontend/src/components/DiscoveryResults.jsx b/frontend/src/components/DiscoveryResults.jsx
index 17e49de..039d2e1 100644
--- a/frontend/src/components/DiscoveryResults.jsx
+++ b/frontend/src/components/DiscoveryResults.jsx
@@ -71,7 +71,11 @@ export default function DiscoveryResults({ scanId, scan, analysis, devMode, onCo
     const pushMetric = result.push_metric;
 
     if (!monitorId || !pushMetric) {
-      console.error('Missing monitor ID or push metric for deployment');
+      const errorMsg = `Missing data for deployment: monitorID=${monitorId}, push_metric=${pushMetric}`;
+      console.error(errorMsg, result);
+      setCreateResults(prev => prev.map((r, i) =>
+        i === resultIndex ? { ...r, deployment: { status: 'failed', error: errorMsg } } : r
+      ));
       return;
     }
 
@@ -375,6 +379,14 @@ export default function DiscoveryResults({ scanId, scan, analysis, devMode, onCo
                           </svg>
                           <span>Script deployed to {result.deployment.script_path}</span>
                         </>
+                      ) : deployingScripts[index] ? (
+                        <>
+                          <svg className="w-4 h-4 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" fill="none" />
+                            <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
+                          </svg>
+                          <span>Deploying script to {scan.hostname}...</span>
+                        </>
                       ) : (
                         <>
                           <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -383,10 +395,9 @@ export default function DiscoveryResults({ scanId, scan, analysis, devMode, onCo
                           <span>Deployment failed: {result.deployment.error}</span>
                           <button
                             onClick={() => handleRetryDeploy(index, result)}
-                            disabled={deployingScripts[index]}
-                            className="ml-2 px-2 py-0.5 text-xs bg-purple-600 hover:bg-purple-500 disabled:bg-slate-600 text-white rounded transition-colors"
+                            className="ml-2 px-2 py-0.5 text-xs bg-purple-600 hover:bg-purple-500 text-white rounded transition-colors"
                           >
-                            {deployingScripts[index] ? 'Deploying...' : 'Retry Deploy'}
+                            Retry Deploy
                           </button>
                         </>
                       )}
@@ -402,17 +413,28 @@ export default function DiscoveryResults({ scanId, scan, analysis, devMode, onCo
                 {/* Push monitor without deployment info (needs manual deploy) */}
                 {result.type === 'push' && result.status === 'created' && !result.deployment && (
                   <div className="mt-2 ml-7 text-sm text-amber-400 flex items-center gap-2">
-                    <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-                    </svg>
-                    <span>Script not deployed</span>
-                    <button
-                      onClick={() => handleRetryDeploy(index, result)}
-                      disabled={deployingScripts[index]}
-                      className="ml-2 px-2 py-0.5 text-xs bg-purple-600 hover:bg-purple-500 disabled:bg-slate-600 text-white rounded transition-colors"
-                    >
-                      {deployingScripts[index] ? 'Deploying...' : 'Deploy Script'}
-                    </button>
+                    {deployingScripts[index] ? (
+                      <>
+                        <svg className="w-4 h-4 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" fill="none" />
+                          <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
+                        </svg>
+                        <span>Deploying script to {scan.hostname}...</span>
+                      </>
+                    ) : (
+                      <>
+                        <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                        </svg>
+                        <span>Script not deployed</span>
+                        <button
+                          onClick={() => handleRetryDeploy(index, result)}
+                          className="ml-2 px-2 py-0.5 text-xs bg-purple-600 hover:bg-purple-500 text-white rounded transition-colors"
+                        >
+                          Deploy Script
+                        </button>
+                      </>
+                    )}
                   </div>
                 )}
               </div>