diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 99fc4bf08..d160b600a 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -59,10 +59,11 @@ class LibraryController extends Zend_Controller_Action
                 $objInfo = Application_Model_Library::getObjInfo($obj_sess->type);
                 Logging::info($obj_sess->id);
                 Logging::info($obj_sess->type);
-                $objInfo = Application_Model_Library::getObjInfo($obj_sess->type);
-                $obj = new $objInfo['className']($obj_sess->id);
-                $userInfo = Zend_Auth::getInstance()->getStorage()->read();
-                $user = new Application_Model_User($userInfo->id);
+
+                $objInfo     = Application_Model_Library::getObjInfo($obj_sess->type);
+                $obj         = new $objInfo['className']($obj_sess->id);
+                $userInfo    = Zend_Auth::getInstance()->getStorage()->read();
+                $user        = new Application_Model_User($userInfo->id);
                 $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
 
                 if ($isAdminOrPM || $obj->getCreatorId() == $userInfo->id) {
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index d098bfbc8..679a20b8e 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -108,7 +108,8 @@ class UserController extends Zend_Controller_Action
 
         # TODO : remove this. we only use default for now not to break the UI.
         if (!$files_action) { # set default action
-            $files_action = "delete_cascade";
+            $files_action = "reassign_to";
+            $valid_actions =
         }
 
         # only delete when valid action is selected for the owned files
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index d9c64746f..1c483e983 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -32,6 +32,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
         return $this->webstream->getDbId();
     }
 
+    public function getCreatorId()
+    {
+        return $this->Webstream->getCcSubjs()->getDbId();
+    }
+
     public function getLastModified($p_type)
     {
         return "modified";