diff --git a/src/app/components/workspace/create-workspace.css b/src/app/components/workspace/create-workspace.css
index d01db84..9354c9e 100644
--- a/src/app/components/workspace/create-workspace.css
+++ b/src/app/components/workspace/create-workspace.css
@@ -450,3 +450,16 @@ label {
     transform: translateY(0);
   }
 }
+
+.spinner {
+  width: 18px;
+  height: 18px;
+  border: 2px solid rgba(255, 255, 255, 0.3);
+  border-radius: 50%;
+  border-top-color: #ffffff;
+  animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
diff --git a/src/app/components/workspace/create-workspace.html b/src/app/components/workspace/create-workspace.html
index 9e40e29..f5e41a0 100644
--- a/src/app/components/workspace/create-workspace.html
+++ b/src/app/components/workspace/create-workspace.html
@@ -96,8 +96,9 @@ <h1>Create Workspace</h1>
 
         <div class="form-actions">
           <button type="submit" [disabled]="isSubmitting || !workspaceForm.form.valid" class="premium-btn">
+            <span *ngIf="isSubmitting" class="spinner" aria-hidden="true"></span>
             <span>{{ isSubmitting ? 'Creating...' : 'Create Workspace' }}</span>
-            <span aria-hidden="true">→</span>
+            <span *ngIf="!isSubmitting" aria-hidden="true">→</span>
           </button>
         </div>
       </form>
diff --git a/src/app/components/workspace/create-workspace.ts b/src/app/components/workspace/create-workspace.ts
index 736bf1e..eccfa0b 100644
--- a/src/app/components/workspace/create-workspace.ts
+++ b/src/app/components/workspace/create-workspace.ts
@@ -88,8 +88,8 @@ export class CreateWorkspace {
           this.error = 'An error occurred while loading the dashboard.';
         });
       },
-      error: () => {
-        this.error = 'Unable to create workspace. Please try again.';
+      error: (err) => {
+        this.error = err.message || 'Unable to create workspace. Please try again.';
         this.isSubmitting = false;
       }
     });