diff --git a/VERSION b/VERSION
index de106cbb..3e220c38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.19.11.30.43
+Version 2.6.0-development+timestamp.2013.07.19.12.42.17
diff --git a/gluon/tools.py b/gluon/tools.py
index eb6d6e50..59747ce6 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1500,7 +1500,7 @@ class Auth(object):
                   label=T('Modified By'),  ondelete=ondelete))
 
     def define_tables(self, username=None, signature=None,
-                      migrate=True, fake_migrate=False):
+                      migrate=None, fake_migrate=None):
         """
         to be called unless tables are defined manually
 
@@ -1516,6 +1516,8 @@ class Auth(object):
         """
 
         db = self.db
+        if migrate is None: migrate = db._migrate
+        if fake_migrate is None: fake_migrate = db._fake_migrate
         settings = self.settings
         if username is None:
             username = settings.use_username