diff --git a/VERSION b/VERSION
index cdd50503..4c040811 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-04-21 11:03:15) dev
+Version 1.99.7 (2012-04-21 11:10:13) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index a69d7598..3b594a20 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -785,7 +785,10 @@ class SQLFORM(FORM):
         self.custom.linkto = Storage()
 
         # default id field name
-        self.id_field_name = table._id.name
+        if not keyed:
+            self.id_field_name = table._id.name
+        else:
+            self.id_field_name = table._primarykey[0] ### only works if one key
 
         sep = separator or ''