--- Form.php	2007-04-23 06:25:11.000000000 +0200
+++ /usr/lib/php5/share/pear/Horde/Form.php	2007-04-30 16:14:30.000000000 +0200
@@ -3769,10 +3769,18 @@
                 $db->setOption('portability', DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_ERRORS);
             }
 
-            $col = $db->getCol($sql);
-            if (!is_a($col, 'PEAR_Error')) {
-                require_once 'Horde/Array.php';
-                $values = Horde_Array::combine($col, $col);
+            $results = $db->getAll($sql);
+            if (!is_a($results, 'PEAR_Error') || !empty($results)) {
+                if (sizeof($results[0]) == 1) {
+                    // Combine the returned column in a indexed array
+                    require_once 'Horde/Array.php';
+                    $values = Horde_Array::combine($results, $results);
+                } else {
+                    // Use the first colum as option value and the second as option name
+                    foreach ($results as $row) {
+                        $values[$row[0]] = $row[1];
+                    }
+                }
             }
         }
         parent::init($values, $prompt);