diff --git a/VERSION b/VERSION
index d5f69327..dea84695 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-04 15:40:01) dev
+Version 1.99.3 (2011-12-04 15:48:02) dev
diff --git a/gluon/html.py b/gluon/html.py
index 3fc5ef75..6442772b 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -1904,9 +1904,10 @@ class FORM(DIV):
             elif callable(onsuccess):
                 onsuccess(self)
             if next:
-                if self.vars.id:
-                    next = next.replace('[id]',str(self.vars.id))
-                    next = next % self.vars
+                if self.vars:
+                    for key,value in self.vars.items():
+                        next = next.replace('[%s]' % key,
+                                            urllib.quote(str(value)))
                     if not next.startswith('/'):
                         next = URL(next)
                 redirect(next)