diff --git a/form.php b/form.php
index 8a20f21..898100e 100644
--- a/form.php
+++ b/form.php
@@ -127,7 +127,7 @@ class form
       foreach ($_SESSION["domframework"]["form"]["fields"] as $field)
       {
         if ($field->type === "hidden" || $field->readonly !== null)
-          $values[$field->name] = $field->defaults;
+          $values[$field->name] = $field->values;
       }
     }
 
@@ -148,6 +148,8 @@ class form
   {
     if (count ($this->fields) === 0)
       throw new Exception ("Can't display a form without defined field", 500);
+    if (isset ($_SESSION))
+      $_SESSION["domframework"]["form"]["fields"] = $this->fields;
     $this->method = strtolower ($method);
     $res = "";
     $res = "<form action='#' method='$method'";
@@ -225,8 +227,6 @@ class form
     $res .= "<script>document.getElementById('".$this->formName."_".
             $focusElement."').focus();</script>\n";
     $res .= "</form>\n";
-    if (isset ($_SESSION))
-      $_SESSION["domframework"]["form"]["fields"] = $this->fields;
     return $res;
   }