diff --git a/VERSION b/VERSION
index 55efd4ed..2a370b81 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-14 14:28:23) dev
+Version 2.00.0 (2012-06-14 14:31:27) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 8268ddb4..59160dbb 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1046,7 +1046,7 @@ class SQLFORM(FORM):
         request_vars,
         session=None,
         formname='%(tablename)s/%(record_id)s',
-        keepvalues=True,
+        keepvalues=None,
         onvalidation=None,
         dbio=True,
         hideerror=False,
@@ -1062,6 +1062,9 @@ class SQLFORM(FORM):
           form.record_changed = None
         """
 
+        if keepvalues is None:
+            keepvalues = True if self.record else False
+
         if self.readonly: return False
 
         if request_vars.__class__.__name__ == 'Request':