diff --git a/libraries/entropy.py b/libraries/entropy.py
index e5969a193..95afbdd1b 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -17272,6 +17272,7 @@ class DistributionUGCCommands(SocketCommandsSkel):
             self.DOC_TYPES['generic_file'],
             self.DOC_TYPES['youtube_video'],
         ]
+        self.raw_commands = ['ugc:add_comment', 'ugc:edit_comment', 'ugc:register_stream']
 
         self.valid_commands = {
             'ugc:get_comments':    {
@@ -17430,6 +17431,8 @@ class DistributionUGCCommands(SocketCommandsSkel):
 
     def docmd_register_stream(self, authenticator, myargs):
 
+        myargs = myargs.split()
+
         if len(myargs) < 3:
             return None,'wrong arguments'
         pkgkey = myargs[0]
@@ -17496,6 +17499,8 @@ class DistributionUGCCommands(SocketCommandsSkel):
 
     def docmd_add_comment(self, authenticator, myargs):
 
+        myargs = myargs.split()
+
         if len(myargs) < 2:
             return None,'wrong arguments'
         pkgkey = myargs[0]
@@ -17555,6 +17560,8 @@ class DistributionUGCCommands(SocketCommandsSkel):
 
     def docmd_edit_comment(self, authenticator, myargs):
 
+        myargs = myargs.split()
+
         if len(myargs) < 2:
             return None,'wrong arguments'
         try: