diff --git a/module/common/model.php b/module/common/model.php
index beb1d06bd3..177c82bc41 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2194,8 +2194,6 @@ EOD;
 
         if(isset($this->app->user))
         {
-            if(in_array($module, $this->config->programPriv->waterfall) and $this->app->tab == 'project') return true;
-
             $this->app->user = $this->session->user;
             if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method);
         }
diff --git a/module/story/control.php b/module/story/control.php
index 81b68283ae..62b5b2af56 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2461,7 +2461,7 @@ class story extends control
         }
         else
         {
-            $productName = $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('name');
+            $productName = $productID ? $this->dao->findById($productID)->from(TABLE_PRODUCT)->fetch('name') : $this->lang->product->all;
             if(isset($this->lang->product->featureBar['browse'][$browseType]))
             {
                 $browseType = $this->lang->product->featureBar['browse'][$browseType];