diff --git a/scripts/setup-test-data.js b/scripts/setup-test-data.js
index 08fed04..fc9308c 100644
--- a/scripts/setup-test-data.js
+++ b/scripts/setup-test-data.js
@@ -138,16 +138,20 @@ const testForms = [
     button: {
       text: 'Send Message'
     },
-    confirmations: [{
-      type: 'message',
-      message: '<p>Thank you for contacting us! We\'ll respond within 24 hours.</p>'
-    }],
-    notifications: [{
-      name: 'Admin Notification',
-      to: '{admin_email}',
-      subject: 'New Contact Form Submission',
-      message: 'You have a new contact form submission from {Name:1}.'
-    }]
+    confirmations: {
+      conf_1: {
+        type: 'message',
+        message: '<p>Thank you for contacting us! We\'ll respond within 24 hours.</p>'
+      }
+    },
+    notifications: {
+      notif_1: {
+        name: 'Admin Notification',
+        to: '{admin_email}',
+        subject: 'New Contact Form Submission',
+        message: 'You have a new contact form submission from {Name:1}.'
+      }
+    }
   },
   {
     title: 'Newsletter Signup (Test)',
@@ -193,10 +197,12 @@ const testForms = [
     button: {
       text: 'Subscribe'
     },
-    confirmations: [{
-      type: 'message',
-      message: '<p>Success! Please check your email to confirm your subscription.</p>'
-    }]
+    confirmations: {
+      conf_1: {
+        type: 'message',
+        message: '<p>Success! Please check your email to confirm your subscription.</p>'
+      }
+    }
   },
   {
     title: 'Multi-Page Survey (Test)',
@@ -263,10 +269,12 @@ const testForms = [
     button: {
       text: 'Submit Survey'
     },
-    confirmations: [{
-      type: 'message',
-      message: '<p>Thank you for your feedback!</p>'
-    }]
+    confirmations: {
+      conf_1: {
+        type: 'message',
+        message: '<p>Thank you for your feedback!</p>'
+      }
+    }
   }
 ];
 
diff --git a/src/config/auth.js b/src/config/auth.js
index 1bc236d..8050e8c 100644
--- a/src/config/auth.js
+++ b/src/config/auth.js
@@ -317,10 +317,19 @@ export async function validateRestApiAccess(httpClient, authManager) {
       { path: '/feeds', name: 'Feeds' }
     ];
 
+    // Get baseURL from httpClient for OAuth signature generation
+    const baseURL = httpClient?.defaults?.baseURL;
+
+    if (!baseURL) {
+      throw new Error('httpClient baseURL is not configured');
+    }
+
     const results = [];
     for (const endpoint of endpoints) {
       try {
-        const headers = authManager.getAuthHeaders();
+        // Generate proper OAuth headers with full URL for signature
+        const fullUrl = `${baseURL}${endpoint.path}`;
+        const headers = authManager.getAuthHeaders('GET', fullUrl, { per_page: 1 });
         await httpClient.get(endpoint.path, {
           headers,
           params: { per_page: 1 }
diff --git a/src/config/validation.js b/src/config/validation.js
index 88bd898..dc75e1f 100644
--- a/src/config/validation.js
+++ b/src/config/validation.js
@@ -309,15 +309,18 @@ export class FormsValidator extends BaseValidator {
     }
 
     if (formData.confirmations !== undefined) {
-      validated.confirmations = this.validateArray(formData.confirmations, 'confirmations');
-      validated.confirmations = validated.confirmations.map((conf, index) => {
+      validated.confirmations = this.validateObject(formData.confirmations, 'confirmations');
+      Object.entries(validated.confirmations).forEach(([key, conf]) => {
         if (conf.type === 'redirect' && conf.url !== undefined) {
-          conf.url = this.validateURL(conf.url, `confirmations[${index}].url`);
+          conf.url = this.validateURL(conf.url, `confirmations.${key}.url`);
         }
-        return conf;
       });
     }
 
+    if (formData.notifications !== undefined) {
+      validated.notifications = this.validateObject(formData.notifications, 'notifications');
+    }
+
     if (formData.schedule_start !== undefined) {
       validated.schedule_start = this.validateDate(formData.schedule_start, 'schedule_start');
     }
diff --git a/src/config/validators.js b/src/config/validators.js
index fd4e63b..af93e0e 100644
--- a/src/config/validators.js
+++ b/src/config/validators.js
@@ -88,12 +88,12 @@ export class FormsValidator {
         .array()
       )
       .field('confirmations', validate('confirmations')
-        .array()
+        .object()
         .custom((confirmations) => {
-          if (Array.isArray(confirmations)) {
-            confirmations.forEach((conf, index) => {
+          if (confirmations && typeof confirmations === 'object') {
+            Object.entries(confirmations).forEach(([key, conf]) => {
               if (conf.type === 'redirect' && conf.url !== undefined) {
-                validate(`confirmations[${index}].url`)
+                validate(`confirmations.${key}.url`)
                   .required()
                   .string()
                   .url()
@@ -104,6 +104,9 @@ export class FormsValidator {
           return true;
         })
       )
+      .field('notifications', validate('notifications')
+        .object()
+      )
       .field('schedule_start', validate('schedule_start')
         .string()
         .date()
diff --git a/src/tests/helpers.js b/src/tests/helpers.js
index 5465874..609fba2 100644
--- a/src/tests/helpers.js
+++ b/src/tests/helpers.js
@@ -179,6 +179,7 @@ export class MockHttpClient {
     this.requests = [];
     this.responses = new Map();
     this.defaultResponse = new MockResponse();
+    this.defaults = { baseURL: 'https://test.example.com' };
   }
 
   /**
diff --git a/src/tests/integration.test.js b/src/tests/integration.test.js
index 811a356..c841b4c 100644
--- a/src/tests/integration.test.js
+++ b/src/tests/integration.test.js
@@ -154,10 +154,12 @@ suite.test('Integration: Create test form', async () => {
     button: {
       text: 'Submit Test'
     },
-    confirmations: [{
-      type: 'message',
-      message: 'Thank you for your test submission!'
-    }]
+    confirmations: {
+      conf_1: {
+        type: 'message',
+        message: 'Thank you for your test submission!'
+      }
+    }
   };
 
   const result = await client.createForm(formData);
diff --git a/src/tests/validation.test.js b/src/tests/validation.test.js
index ade85f0..2fb7d8e 100644
--- a/src/tests/validation.test.js
+++ b/src/tests/validation.test.js
@@ -411,10 +411,12 @@ suite.test('Format Validation: URLs', async () => {
   await TestAssert.throwsAsync(
     () => client.createForm({
       title: 'Test',
-      confirmations: [{
-        type: 'redirect',
-        url: 'not-a-url'
-      }]
+      confirmations: {
+        conf_1: {
+          type: 'redirect',
+          url: 'not-a-url'
+        }
+      }
     }),
     'valid URL',
     'Should validate URL format'
@@ -427,10 +429,12 @@ suite.test('Format Validation: URLs', async () => {
 
   await client.createForm({
     title: 'Test',
-    confirmations: [{
-      type: 'redirect',
-      url: 'https://example.com'
-    }]
+    confirmations: {
+      conf_1: {
+        type: 'redirect',
+        url: 'https://example.com'
+      }
+    }
   });
 });