diff -urp modules/compact_forms-5.x-1.0/compact_forms.css modules/compact_forms-6.x-1.0/compact_forms.css
--- modules/compact_forms-5.x-1.0/compact_forms.css	2007-07-29 10:20:58.000000000 -0700
+++ modules/compact_forms-6.x-1.0/compact_forms.css	2008-12-24 09:27:03.000000000 -0800
@@ -1,4 +1,4 @@
-/* $Id: compact_forms.css,v 1.1 2007/07/29 17:20:58 tomsun Exp $ */
+/* $Id: compact_forms.css,v 1.1 2007/07/29 17:20:58 tomsun Exp $ */
 
 .compact-form-wrapper {
   position: relative;
diff -urp modules/compact_forms-5.x-1.0/compact_forms.info modules/compact_forms-6.x-1.0/compact_forms.info
--- modules/compact_forms-5.x-1.0/compact_forms.info	2007-07-29 11:25:05.000000000 -0700
+++ modules/compact_forms-6.x-1.0/compact_forms.info	2008-12-24 09:27:04.000000000 -0800
@@ -1,9 +1,6 @@
-; $Id: compact_forms.info,v 1.1 2007/07/29 17:20:58 tomsun Exp $
+; $Id$
 name = Compact Forms
 description = "Makes form fields compact by overlaying the field label on top the field itself using jQuery."
-
-; Information added by drupal.org packaging script on 2007-07-29
-version = "5.x-1.0"
-project = "compact_forms"
-datestamp = "1185733505"
-
+package = Forms
+core = 6.x
+
diff -urp modules/compact_forms-5.x-1.0/compact_forms.module modules/compact_forms-6.x-1.0/compact_forms.module
--- modules/compact_forms-5.x-1.0/compact_forms.module	2007-07-29 10:20:58.000000000 -0700
+++ modules/compact_forms-6.x-1.0/compact_forms.module	2008-12-24 14:01:18.000000000 -0800
@@ -1,7 +1,8 @@
-<?php // $Id: compact_forms.module,v 1.1 2007/07/29 17:20:58 tomsun Exp $
+<?php // $Id$
 /*
     Compact Forms Drupal module
     Copyright 2007 Tom Sundström
+    Copyright 2008 Sameer Siruguri
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 as
@@ -44,19 +45,18 @@ function compact_forms_perm() {
 /**
  * Implementation of hook_form_alter().
  */
-function compact_forms_form_alter($form_id, &$form) {
+function compact_forms_form_alter(&$form, $form_state, $form_id) {
   $field_size = variable_get('compact_forms_field_size', '');
   $descriptions = variable_get('compact_forms_descriptions', 1);
-  if (empty($field_size) && !empty($descriptions)) {
-    // Nothing to alter.
-    return;
-  }
 
   static $ids = NULL;
-  if ($ids === NULL) {
+  if ($ids == NULL) {
+    // The user login form will be modified even if no IDs are supplied.
     $ids = explode("\n", str_replace('-', '_', variable_get('compact_forms_ids', "user-login-form")));
   }
-  if (in_array($form_id, $ids)) {
+  
+  if (in_array($form_id, $ids) || in_array($form_id."\n", $ids)) {
+    _compact_forms_include_js();
     _compact_forms_resize_fields($form, $field_size, $descriptions);
   }
 }
@@ -71,7 +71,7 @@ function _compact_forms_resize_fields(&$
       switch($field['#type']) {
 
         case 'fieldset':
-          _compact_forms_resize_fields($subform[$key], $field_size);
+          _compact_forms_resize_fields($subform[$key], $field_size, $descriptions);
           break;
         
         case 'textfield':
@@ -92,28 +92,53 @@ function _compact_forms_resize_fields(&$
 /**
  * Implementation of hook_menu().
  */
-function compact_forms_menu($may_cache) {
+function compact_forms_menu() {
   global $user;
   $items = array();
 
-  if (!$may_cache) {
-    
-    _compact_forms_include_js();
+  dpm('entered compact forms menu hook');
 
-    $items[] = array(
-      'title' => t('Compact Forms'),
-      'path' => 'admin/settings/compact_forms',
-      'description' => t('Makes form fields compact by overlaying the field label on top the field itself using jQuery.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'compact_forms_admin_form',
-      'access' => user_access('administer Compact Forms'),
-    );
-  }
+  $items['admin/settings/compact_forms'] = 
+    array(
+	  'title' => t('Compact Forms'),
+	  'description' => t('Makes form fields compact by overlaying the field label on top the field itself using jQuery.'),
+	  'page callback' => 'drupal_get_form',
+	  'page arguments' => array('compact_forms_admin_form'),
+	  'access callback' => 'user_access',
+	  'access arguments' => array('administer Compact Forms'),
+	  );
 
   return $items;
 }
 
 
+function compact_forms_admin_form_validate($form, &$form_state) {
+  $form_id=$form_state['values']['form_id'];
+  if (!empty($form_id)) {
+    $compact_forms_ids=$form_state['values']['compact_forms_ids'];
+    $ids_array=explode("\n", $compact_forms_ids);
+    
+    $all_clear=1;
+    $faulty_index=0;
+    foreach ($ids_array as $id) {
+      $faulty_index++;
+      if (preg_match('/ /', trim($id))) {
+	$all_clear=0;
+	break;
+      }
+    }
+    if (!$all_clear) {
+      form_set_error('compact_forms_ids', t('The ID in line !line_number contains whitespace. Please remove whitespace and re-enter.', array('!line_number' => $faulty_index)));
+    } else {
+      $ids_trimmed=array();
+      foreach ($ids_array as $id) {
+	$ids_trimmed[]=trim($id);
+      }
+      $form_state['values']['compact_forms_ids']=implode("\n", $ids_trimmed);
+    }
+  }
+}
+
 /**
  * Compact Forms admin settings.
  */
@@ -121,11 +146,11 @@ function compact_forms_admin_form() {
 
   $form['compact_forms_ids'] = array(
     '#type' => 'textarea',
-    '#title' => t('Form ID:s'),
+    '#title' => t('Form IDs'),
     '#rows' => 3,
     '#cols' => 40,
     '#default_value' => variable_get('compact_forms_ids', "user-login-form"),
-    '#description' => 'Enter the CSS #id of the forms that you want to activate compact_forms for. One per line.',
+    '#description' => 'Enter the CSS #id of the forms that you want to activate compact_forms for, one per line, using hyphens in place of underscores, for example, <i>user-login-form</i>. Note that the user login form will be modified even if this is left empty.',
   );
   
   $form['compact_forms_stars'] = array(
@@ -176,8 +201,8 @@ function compact_forms_admin_form() {
  * Include JavaScript and CSS and attach behaviours to all selected forms.
  */
 function _compact_forms_include_js() {
-    $ids = explode("\n", variable_get('compact_forms_ids', "user-login-form"));
-    $inline_js = '';
+  $ids = explode("\n", variable_get('compact_forms_ids', "user-login-form"));
+  $inline_js = '';
     
     if (is_array($ids) && !empty($ids)) {
       $stars = variable_get('compact_forms_stars', 2);
@@ -186,7 +211,8 @@ function _compact_forms_include_js() {
       foreach ($ids as $id) {
         $id = trim($id);
         if (!empty($id)) {
-         
+
+# create a call via jQuery to the compactForm() Javascript function         
           $inline_js .= '$("#' . $id. '").compactForm(' . $stars . ', ' . $colons . ');';
         }
       }