diff --git a/browser/common.py b/browser/common.py
index 897ff96..076c23c 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -670,7 +670,10 @@ class BaseView(GenericView, I18NView):
 
     # states
 
-    viewStatesPermission = 'zope.ManageContent'
+    @Lazy
+    def viewStatesPermission(self):
+        opt = self.globalOptions('organize.show_states')
+        return opt and opt[0] or 'zope.ManageContent'
 
     @Lazy
     def states(self):
diff --git a/organize/work/browser.py b/organize/work/browser.py
index d296baf..155745b 100644
--- a/organize/work/browser.py
+++ b/organize/work/browser.py
@@ -151,6 +151,7 @@ class WorkItemDetails(TrackDetails):
                       addParams=dict(id=self.track.__name__))
         actions = [info, WorkItemStateAction(self)]
         if self.isLastInRun and self.allowedToEditWorkItem:
+        #if self.allowedToEditWorkItem:
             self.view.registerDojoDateWidget()
             self.view.registerDojoNumberWidget()
             self.view.registerDojoTextarea()