diff --git a/browser/common.py b/browser/common.py
index 82c6d65..eb42fd8 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -704,8 +704,8 @@ class BaseView(GenericView, I18NView):
         if IResource.providedBy(self.target):
             statesDefs = self.globalOptions('organize.stateful.resource', ())
         else:
-            statesDefs = (self.globalOptions('organize.stateful.concept', []) +
-                          self.typeOptions('organize.stateful', []))
+            statesDefs = ((self.globalOptions('organize.stateful.concept') or []) +
+                          (self.typeOptions('organize.stateful') or []))
         for std in statesDefs:
             stf = component.getAdapter(self.target, IStateful, name=std)
             result.append(stf)
diff --git a/organize/browser/member.py b/organize/browser/member.py
index 5916929..738b521 100644
--- a/organize/browser/member.py
+++ b/organize/browser/member.py
@@ -112,7 +112,8 @@ class BaseMemberRegistration(NodeView):
 
     @Lazy
     def macro(self):
-        return schema_macros.macros['form']
+        #return schema_macros.macros['form']
+        return organize_macros.macros['register']
 
     def checkPermissions(self):
         personType = adapted(self.conceptManager['person'])