diff --git a/ftw/subsite/profiles/default/viewlets.xml b/ftw/subsite/profiles/default/viewlets.xml
index ebeef41..48fc51d 100644
--- a/ftw/subsite/profiles/default/viewlets.xml
+++ b/ftw/subsite/profiles/default/viewlets.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0"?>
 <object>
- <order manager="plone.portalheader" skinname="*">
-  <viewlet name="ftw.subsite.languageselector" />
-  <viewlet name="plone.logo" inser-before="ftw.subsite.banner" />
-  <viewlet name="ftw.subsite.banner" insert-after="plone.logo" />
-  <viewlet name="plone.global_sections" insert-after="ftw.subsite.banner" />
- </order>
- <hidden manager="plone.portalheader" skinname="*">
-     <viewlet name="plone.app.i18n.locales.languageselector" />
- </hidden>
+
+    <order manager="plone.portalheader" skinname="*">
+        <viewlet name="ftw.subsite.languageselector" />
+        <viewlet name="plone.logo" inser-before="ftw.subsite.banner" />
+        <viewlet name="ftw.subsite.banner" insert-after="plone.logo" />
+        <viewlet name="plone.global_sections" insert-after="ftw.subsite.banner" />
+    </order>
+
+    <hidden manager="plone.portalheader" skinname="*">
+        <viewlet name="plone.app.i18n.locales.languageselector" />
+    </hidden>
+
+    <!-- Plone 4.1 does not hide on skinname="*" -->
+    <hidden manager="plone.portalheader" skinname="Plone Default">
+        <viewlet name="plone.app.i18n.locales.languageselector" />
+    </hidden>
+
 </object>