diff --git a/evennia/commands/cmdhandler.py b/evennia/commands/cmdhandler.py
index e8bb898cb3..3281687377 100644
--- a/evennia/commands/cmdhandler.py
+++ b/evennia/commands/cmdhandler.py
@@ -235,7 +235,7 @@ def get_and_merge_cmdsets(caller, session, player, obj, callertype, raw_string):
                     for lobj in local_objlist:
                         try:
                             # call hook in case we need to do dynamic changing to cmdset
-                            _GA(lobj, "at_cmdset_get")()
+                            _GA(lobj, "at_cmdset_get")(caller=caller)
                         except Exception:
                             logger.log_trace()
                     # the call-type lock is checked here, it makes sure a player
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index b22ce84d74..d2934f4dfc 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -1033,8 +1033,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         have no cmdsets.
 
         Kwargs:
-            Usually not set but could be used e.g. to force rebuilding
-            of a dynamically created cmdset or similar.
+            caller (Session, Object or Player): The caller requesting
+                this cmdset.
 
         """
         pass