diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/form.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/form.xsl
index 308fbddd1..8516f3f06 100755
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/form.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/form.xsl
@@ -33,7 +33,8 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0" 
                 xmlns:foundry="http://foundry.libreccm.org" 
                 xmlns:nav="http://ccm.redhat.com/navigation" 
-                exclude-result-prefixes="xsl bebop cms nav"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl bebop cms foundry nav"
                 version="2.0">
 
     <!-- DE Formulare -->
@@ -45,7 +46,7 @@
             </div>
         </xsl:if>
         <form>
-            <xsl:if test="not(@method)">
+            <xsl:if test="not(./@method)">
                 <xsl:attribute name="method">post</xsl:attribute>
             </xsl:if>
             <xsl:call-template name="foundry:process-datatree-attributes"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/page.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/page.xsl
index 1bbfc0025..c6f3cbe59 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/page.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/page.xsl
@@ -39,6 +39,9 @@
     <!-- DE Schreibe den PageState in versteckte Input-Felder -->
     <!-- EN Save the page state in hidden input fields -->
     <xsl:template match="bebop:pageState">
+        <xsl:message>
+            Creating hidden input for pageState
+        </xsl:message>
         <input>
             <xsl:attribute name="type">
                 <xsl:value-of select="'hidden'"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
index 397d7ed9c..89729899f 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
@@ -25,6 +25,7 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:foundry="http://foundry.libreccm.org"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="xsl xs bebop cms foundry ui"
                 version="2.0">
 
@@ -43,12 +44,19 @@
             <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] 
                             | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]">
                 <form>
-                    <xsl:if test="not(@method)">
-                        <xsl:attribute name="method">post</xsl:attribute>
-                    </xsl:if>
+                    <xsl:attribute name="method" 
+                                   select="if ($data-tree//bebop:form/@method)
+                                           then $data-tree//bebop:form/@method
+                                           else 'post'"/>
                     <xsl:call-template name="foundry:process-datatree-attributes"/>
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body 
                                                  | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
+                    <xsl:message>
+                        <xsl:value-of select="concat('Applying template for bebop:pageState to ', 
+                                                     count($data-tree//bebop:currentPane/bebop:form//bebop:pageState), 
+                                                     ' objects...')"/>
+                    </xsl:message>
+                    <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:pageState"/>
                 </form>
             </xsl:when>
       
@@ -87,9 +95,10 @@
         <xsl:choose>
             <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left[//bebop:formWidget]">
                 <form>
-                    <xsl:if test="not(@method)">
-                        <xsl:attribute name="method">post</xsl:attribute>
-                    </xsl:if>
+                    <xsl:attribute name="method" 
+                                   select="if ($data-tree//bebop:form/@method)
+                                           then $data-tree//bebop:form/@method
+                                           else 'post'"/>
                     <xsl:call-template name="foundry:process-datatree-attributes"/>
                     <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left"/>
                 </form>