diff --git a/include/ajax.orgs.php b/include/ajax.orgs.php
index b8309a55edae5ecfadf028e155b7ca45bc27bac4..aa6937bc38f9c96312ee53be6da45737b795c4e6 100644
--- a/include/ajax.orgs.php
+++ b/include/ajax.orgs.php
@@ -255,7 +255,7 @@ class OrgsAjaxAPI extends AjaxController {
     }
 
     function manageForms($org_id) {
-        $forms = DynamicFormEntry::forOrganization($org_id);
+        $forms = DynamicFormEntry::forObject($org_id, 'O');
         $info = array('action' => '#orgs/'.Format::htmlchars($org_id).'/forms/manage');
         include(STAFFINC_DIR . 'templates/form-manage.tmpl.php');
     }
@@ -271,7 +271,7 @@ class OrgsAjaxAPI extends AjaxController {
             Http::response(422, "Send updated forms list");
 
         // Add new forms
-        $forms = DynamicFormEntry::forOrganization($org_id);
+        $forms = DynamicFormEntry::forObject($org_id, 'O');
         foreach ($_POST['forms'] as $sort => $id) {
             $found = false;
             foreach ($forms as $e) {
diff --git a/include/ajax.users.php b/include/ajax.users.php
index f211ff6e644238b29576f92313d8695e6f74cc51..02a3b1668427dd011db3b9edba9c6b063e584dd2 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -412,7 +412,7 @@ class UsersAjaxAPI extends AjaxController {
     }
 
     function manageForms($user_id) {
-        $forms = DynamicFormEntry::forUser($user_id);
+        $forms = DynamicFormEntry::forObject($user_id, 'U');
         $info = array('action' => '#users/'.Format::htmlchars($user_id).'/forms/manage');
         include(STAFFINC_DIR . 'templates/form-manage.tmpl.php');
     }
@@ -428,7 +428,7 @@ class UsersAjaxAPI extends AjaxController {
             Http::response(422, "Send updated forms list");
 
         // Add new forms
-        $forms = DynamicFormEntry::forUser($user_id);
+        $forms = DynamicFormEntry::forObject($user_id, 'U');
         foreach ($_POST['forms'] as $sort => $id) {
             $found = false;
             foreach ($forms as $e) {
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 7c9e84b515d9eae4be05c2f87a4df56a2ae9e665..53f3760e028dae0ec2c39cfea43a75db68aa4ebb 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -920,11 +920,6 @@ class DynamicFormEntry extends VerySimpleModel {
         $this->object_id = $ticket_id;
     }
 
-    function forClient($user_id) {
-        return DynamicFormEntry::objects()
-            ->filter(array('object_id'=>$user_id, 'object_type'=>'U'));
-    }
-
     function setClientId($user_id) {
         $this->object_type = 'U';
         $this->object_id = $user_id;
@@ -934,14 +929,9 @@ class DynamicFormEntry extends VerySimpleModel {
         $this->object_id = $object_id;
     }
 
-    function forUser($user_id) {
-        return DynamicFormEntry::objects()
-            ->filter(array('object_id'=>$user_id, 'object_type'=>'U'));
-    }
-
-    function forOrganization($org_id) {
+    function forObject($object_id, $object_type) {
         return DynamicFormEntry::objects()
-            ->filter(array('object_id'=>$org_id, 'object_type'=>'O'));
+            ->filter(array('object_id'=>$object_id, 'object_type'=>$object_type));
     }
 
     function render($staff=true, $title=false, $options=array()) {
diff --git a/include/class.user.php b/include/class.user.php
index 8e6382e9dbb04c84e4485b421b18ef47d7f9dd09..0010004372ace9b061a07a2a51fb6c6719ebc825 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -287,7 +287,7 @@ class User extends UserModel {
 
     function getDynamicData($create=true) {
         if (!isset($this->_entries)) {
-            $this->_entries = DynamicFormEntry::forClient($this->id)->all();
+            $this->_entries = DynamicFormEntry::forObject($this->id, 'U')->all();
             if (!$this->_entries && $create) {
                 $g = UserForm::getNewInstance();
                 $g->setClientId($this->id);