diff --git a/admin-spa/src/components/settings/GenericGatewayForm.tsx b/admin-spa/src/components/settings/GenericGatewayForm.tsx
index afdca97..9ccba9d 100644
--- a/admin-spa/src/components/settings/GenericGatewayForm.tsx
+++ b/admin-spa/src/components/settings/GenericGatewayForm.tsx
@@ -21,6 +21,7 @@ interface GatewayField {
   title: string;
   description: string;
   default: string | boolean;
+  value?: string | boolean;  // Current saved value from backend
   placeholder?: string;
   required: boolean;
   options?: Record<string, string>;
@@ -56,6 +57,26 @@ export function GenericGatewayForm({ gateway, onSave, onCancel }: GenericGateway
   const [isSaving, setIsSaving] = useState(false);
   const [unsupportedFields, setUnsupportedFields] = useState<string[]>([]);
 
+  // Initialize form data with current gateway values
+  React.useEffect(() => {
+    const initialData: Record<string, unknown> = {};
+    
+    const categories: Record<string, GatewayField>[] = [
+      gateway.settings.basic,
+      gateway.settings.api,
+      gateway.settings.advanced,
+    ];
+    
+    categories.forEach((category) => {
+      Object.values(category).forEach((field) => {
+        // Use current value from field (backend sends this now!)
+        initialData[field.id] = field.value ?? field.default;
+      });
+    });
+    
+    setFormData(initialData);
+  }, [gateway]);
+
   // Check for unsupported fields
   React.useEffect(() => {
     const unsupported: string[] = [];
@@ -121,7 +142,10 @@ export function GenericGatewayForm({ gateway, onSave, onCancel }: GenericGateway
                 {field.required && <span className="text-destructive ml-1">*</span>}
               </Label>
               {field.description && (
-                <p className="text-sm text-muted-foreground">{field.description}</p>
+                <p 
+                  className="text-sm text-muted-foreground" 
+                  dangerouslySetInnerHTML={{ __html: field.description }}
+                />
               )}
             </div>
           </div>
@@ -225,25 +249,26 @@ export function GenericGatewayForm({ gateway, onSave, onCancel }: GenericGateway
   const useMultiPage = totalFields >= 20;
 
   return (
-    <form onSubmit={handleSubmit} className="space-y-6">
-      {/* Warning for unsupported fields */}
-      {unsupportedFields.length > 0 && (
-        <Alert>
-          <AlertTriangle className="h-4 w-4" />
-          <AlertDescription>
-            Some advanced settings are not supported in this interface.{' '}
-            <a
-              href={gateway.wc_settings_url}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="inline-flex items-center gap-1 font-medium underline"
-            >
-              Configure in WooCommerce
-              <ExternalLink className="h-3 w-3" />
-            </a>
-          </AlertDescription>
-        </Alert>
-      )}
+    <>
+      <form onSubmit={handleSubmit} className="space-y-6">
+        {/* Warning for unsupported fields */}
+        {unsupportedFields.length > 0 && (
+          <Alert>
+            <AlertTriangle className="h-4 w-4" />
+            <AlertDescription>
+              Some advanced settings are not supported in this interface.{' '}
+              <a
+                href={gateway.wc_settings_url}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="inline-flex items-center gap-1 font-medium underline"
+              >
+                Configure in WooCommerce
+                <ExternalLink className="h-3 w-3" />
+              </a>
+            </AlertDescription>
+          </Alert>
+        )}
 
       {useMultiPage ? (
         <Tabs defaultValue="basic" className="w-full">
@@ -295,9 +320,10 @@ export function GenericGatewayForm({ gateway, onSave, onCancel }: GenericGateway
           )}
         </div>
       )}
+      </form>
 
-      {/* Actions */}
-      <div className="flex items-center justify-between pt-4 border-t">
+      {/* Sticky Footer */}
+      <div className="sticky bottom-0 bg-background border-t px-6 py-4 flex items-center justify-between mt-6">
         <Button
           type="button"
           variant="outline"
@@ -324,11 +350,18 @@ export function GenericGatewayForm({ gateway, onSave, onCancel }: GenericGateway
             </a>
           </Button>
 
-          <Button type="submit" disabled={isSaving}>
+          <Button 
+            onClick={(e) => {
+              e.preventDefault();
+              const form = document.querySelector('form');
+              if (form) form.requestSubmit();
+            }}
+            disabled={isSaving}
+          >
             {isSaving ? 'Saving...' : 'Save Settings'}
           </Button>
         </div>
       </div>
-    </form>
+    </>
   );
 }
diff --git a/admin-spa/src/routes/Settings/Payments.tsx b/admin-spa/src/routes/Settings/Payments.tsx
index 71c6054..89e48b3 100644
--- a/admin-spa/src/routes/Settings/Payments.tsx
+++ b/admin-spa/src/routes/Settings/Payments.tsx
@@ -18,6 +18,7 @@ interface GatewayField {
   title: string;
   description: string;
   default: string | boolean;
+  value: string | boolean;  // Current saved value
   placeholder?: string;
   required: boolean;
   options?: Record<string, string>;
@@ -327,15 +328,17 @@ export default function PaymentsPage() {
       {/* Gateway Settings Modal */}
       {selectedGateway && (
         <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
-          <DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
-            <DialogHeader>
+          <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col p-0">
+            <DialogHeader className="px-6 pt-6 pb-4 border-b">
               <DialogTitle>{selectedGateway.title} Settings</DialogTitle>
             </DialogHeader>
-            <GenericGatewayForm
-              gateway={selectedGateway}
-              onSave={handleSaveGateway}
-              onCancel={() => setIsModalOpen(false)}
-            />
+            <div className="flex-1 overflow-y-auto px-6 py-4">
+              <GenericGatewayForm
+                gateway={selectedGateway}
+                onSave={handleSaveGateway}
+                onCancel={() => setIsModalOpen(false)}
+              />
+            </div>
           </DialogContent>
         </Dialog>
       )}
diff --git a/includes/Compat/PaymentGatewaysProvider.php b/includes/Compat/PaymentGatewaysProvider.php
index 9ad6f00..01a3e25 100644
--- a/includes/Compat/PaymentGatewaysProvider.php
+++ b/includes/Compat/PaymentGatewaysProvider.php
@@ -194,11 +194,12 @@ class PaymentGatewaysProvider {
      */
     private static function get_gateway_settings(WC_Payment_Gateway $gateway): array {
         $form_fields = $gateway->get_form_fields();
+        $current_settings = $gateway->settings;  // Get current saved values
         
         return [
-            'basic' => self::extract_basic_fields($form_fields),
-            'api' => self::extract_api_fields($form_fields),
-            'advanced' => self::extract_advanced_fields($form_fields),
+            'basic' => self::extract_basic_fields($form_fields, $current_settings),
+            'api' => self::extract_api_fields($form_fields, $current_settings),
+            'advanced' => self::extract_advanced_fields($form_fields, $current_settings),
         ];
     }
     
@@ -208,9 +209,9 @@ class PaymentGatewaysProvider {
      * @param array $form_fields All form fields
      * @return array Basic fields
      */
-    private static function extract_basic_fields(array $form_fields): array {
+    private static function extract_basic_fields(array $form_fields, array $current_settings): array {
         $basic_keys = ['enabled', 'title', 'description', 'instructions'];
-        return self::filter_fields($form_fields, $basic_keys);
+        return self::filter_fields($form_fields, $basic_keys, $current_settings);
     }
     
     /**
@@ -219,14 +220,14 @@ class PaymentGatewaysProvider {
      * @param array $form_fields All form fields
      * @return array API fields
      */
-    private static function extract_api_fields(array $form_fields): array {
+    private static function extract_api_fields(array $form_fields, array $current_settings): array {
         $api_patterns = ['key', 'secret', 'token', 'api', 'client', 'merchant', 'account'];
         $api_fields = [];
         
         foreach ($form_fields as $key => $field) {
             foreach ($api_patterns as $pattern) {
                 if (stripos($key, $pattern) !== false) {
-                    $api_fields[$key] = self::normalize_field($key, $field);
+                    $api_fields[$key] = self::normalize_field($key, $field, $current_settings);
                     break;
                 }
             }
@@ -241,7 +242,7 @@ class PaymentGatewaysProvider {
      * @param array $form_fields All form fields
      * @return array Advanced fields
      */
-    private static function extract_advanced_fields(array $form_fields): array {
+    private static function extract_advanced_fields(array $form_fields, array $current_settings): array {
         $basic_keys = ['enabled', 'title', 'description', 'instructions'];
         $advanced_fields = [];
         
@@ -262,7 +263,7 @@ class PaymentGatewaysProvider {
             }
             
             if (!$is_api) {
-                $advanced_fields[$key] = self::normalize_field($key, $field);
+                $advanced_fields[$key] = self::normalize_field($key, $field, $current_settings);
             }
         }
         
@@ -276,12 +277,12 @@ class PaymentGatewaysProvider {
      * @param array $keys Keys to extract
      * @return array Filtered fields
      */
-    private static function filter_fields(array $form_fields, array $keys): array {
+    private static function filter_fields(array $form_fields, array $keys, array $current_settings): array {
         $filtered = [];
         
         foreach ($keys as $key) {
             if (isset($form_fields[$key])) {
-                $filtered[$key] = self::normalize_field($key, $form_fields[$key]);
+                $filtered[$key] = self::normalize_field($key, $form_fields[$key], $current_settings);
             }
         }
         
@@ -295,13 +296,17 @@ class PaymentGatewaysProvider {
      * @param array $field Field data
      * @return array Normalized field
      */
-    private static function normalize_field(string $key, array $field): array {
+    private static function normalize_field(string $key, array $field, array $current_settings): array {
+        // Use current value if available, otherwise use default
+        $current_value = $current_settings[$key] ?? $field['default'] ?? '';
+        
         return [
             'id' => $key,
             'type' => $field['type'] ?? 'text',
             'title' => $field['title'] ?? '',
             'description' => $field['description'] ?? '',
             'default' => $field['default'] ?? '',
+            'value' => $current_value,  // Add current value!
             'placeholder' => $field['placeholder'] ?? '',
             'required' => !empty($field['required']),
             'options' => $field['options'] ?? null,