Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/usereditformpage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/usereditformpage.pt	(revision 10955)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/usereditformpage.pt	(revision 10956)
@@ -9,5 +9,5 @@
         <td i18n:translate="" class="fieldname">Password:</td>
         <td>
-          <input name="password" type="password"  />
+          <input class="form-control" name="password" type="password"  />
         </td>
       </tr>
@@ -15,5 +15,5 @@
         <td i18n:translate="" class="fieldname">Retype Password:</td>
         <td>
-          <input name="control_password" type="password" />
+          <input class="form-control" name="control_password" type="password" />
         </td>
       </tr>
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/widgets/phonewidget.py
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/widgets/phonewidget.py	(revision 10955)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/widgets/phonewidget.py	(revision 10956)
@@ -37,5 +37,5 @@
 
     subwidget_names = ('country', 'area', 'ext')
-    bootstrap_span = 'span2'
+    cssClass = 'phone-input'
 
     def _renderPrefixWidget(self, value):
@@ -51,7 +51,8 @@
                 '<option value="%s"%s>%s</option>' % (pval, selected, ptitle))
         options = '\n'.join(options)
-        return '<select id="%s" name="%s" size="1" class="span4">\n%s\n</select>' % (
+        return '<select id="%s" name="%s" size="1" class="%s">\n%s\n</select>' % (
             '%s.%s' % (self.name, 'country'),
             '%s.%s' % (self.name, 'country'),
+            self.cssClass,
             options)
 
@@ -83,6 +84,5 @@
             kwargs.update(name = '%s.%s' % (self.name, subname))
             kwargs.update(id=kwargs['name'])
-            # kwargs.update(cssClass = '%s %s' % (self.cssClass, 'span1'))
-            kwargs.update(cssClass = '%s %s' % ('', self.bootstrap_span))
+            kwargs.update(cssClass = '%s %s' % ('', self.cssClass))
             kwargs.update(value = subvalues[num])
             fields.append(renderElement(self.tag, **kwargs))
