diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 5db36e7c..166b60bb 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -773,7 +773,7 @@ def formstyle_bootstrap(form, fields):
         _submit = False
 
         if isinstance(controls, INPUT):
-            controls.add_class('input-xlarge')
+            controls.add_class('span4')
             if controls['_type'] == 'submit':
                 # flag submit button
                 _submit = True
@@ -783,13 +783,13 @@ def formstyle_bootstrap(form, fields):
 
         # For password fields, which are wrapped in a CAT object.
         if isinstance(controls, CAT) and isinstance(controls[0], INPUT):
-            controls[0].add_class('input-xlarge')
+            controls[0].add_class('span4')
 
         if isinstance(controls, SELECT):
-            controls.add_class('input-xlarge')
+            controls.add_class('span4')
 
         if isinstance(controls, TEXTAREA):
-            controls.add_class('input-xlarge')
+            controls.add_class('span4')
 
         if isinstance(label, LABEL):
             label['_class'] = 'control-label'
diff --git a/gluon/tools.py b/gluon/tools.py
index 8ef57107..821a91d3 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2330,7 +2330,7 @@ class Auth(object):
 
                     if formstyle == 'bootstrap':
                         form.custom.widget.password_two[
-                            '_class'] = 'input-xlarge'
+                            '_class'] = 'span4'
 
                     addrow(
                         form, self.messages.verify_password +