diff --git a/js/settings.js b/js/settings.js
index a77bffb..034cc2e 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -17,7 +17,7 @@ user_sql.adminSettingsUI = function()
         $('#sqlDiv').tabs();
         
         // Attach auto-completion to all column fields
-        $('#col_username, #col_password, #col_displayname, #col_active, #col_email, #col_gethome').autocomplete({
+        $('#col_username, #col_password, #col_displayname, #col_active, #col_email, #col_gethome, #col_group_name, #col_group_username').autocomplete({
             source: function(request, response)
             {
                 var post = $('#sqlForm').serializeArray();
@@ -56,7 +56,7 @@ user_sql.adminSettingsUI = function()
         });        
         
         // Attach auto-completion to all table fields
-        $('#sql_table').autocomplete({
+        $('#sql_table, #sql_group_table').autocomplete({
             source: function(request, response)
             {
                 var post = $('#sqlForm').serializeArray();
diff --git a/lib/helper.php b/lib/helper.php
index e19bc6b..9d9c80a 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -314,13 +314,19 @@ class Helper {
         try {
             $conn = $cm -> getConnection($sql_driver, $parameters);
             $platform = $conn -> getDatabasePlatform();
-            $query = $platform -> getListTablesSQL();
-            $result = $conn -> executeQuery($query);
+
+            $queries = array(
+                'Tables_in_'.$parameters['dbname'] => $platform -> getListTablesSQL(),
+                'TABLE_NAME' => $platform -> getListViewsSQL($parameters['dbname']));
             $ret = array();
-            while($row = $result -> fetch())
+            foreach($queries as $field => $query)
             {
-                $name = $row['Tables_in_'.$parameters['dbname']];
-                $ret[] = $name;
+                $result = $conn -> executeQuery($query);
+                while($row = $result -> fetch())
+                {
+                    $name = $row[$field];
+                    $ret[] = $name;
+                }
             }
             return $ret;
         }