diff --git a/CLScript/CloudLinuxResellers.py b/CLScript/CloudLinuxResellers.py
index 0f93d04a6..c5a1e3683 100755
--- a/CLScript/CloudLinuxResellers.py
+++ b/CLScript/CloudLinuxResellers.py
@@ -23,17 +23,26 @@ class CloudLinuxResellers(CLMain):
         self.name = name
 
     def listAll(self, owner=None):
+        import pwd
         users = []
         acl = ACL.objects.get(name='reseller')
+        from plogical.vhost import vhost
         for items in Administrator.objects.filter(acl=acl):
             if self.name != None:
                 if self.name != items.userName:
                     continue
 
+
+            try:
+                uid = pwd.getpwnam(items.userName).pw_uid
+            except:
+                vhost.addUser(items.userName, '/home/%s' % (items.userName))
+                uid = pwd.getpwnam(items.userName).pw_uid
+
             user = {'name': items.userName,
                     "locale_code": "EN_us",
                      "email": items.email,
-                    "id": None
+                    "id": uid
                     }
 
             users.append(user)
diff --git a/CLScript/CloudLinuxUsers.py b/CLScript/CloudLinuxUsers.py
index bdc984655..1ae5b725b 100755
--- a/CLScript/CloudLinuxUsers.py
+++ b/CLScript/CloudLinuxUsers.py
@@ -81,7 +81,7 @@ class CloudLinuxUsers(CLMain):
         for webs in websites:
             try:
                 itemPackage = webs.package
-                package = {'name': itemPackage.packageName, 'owner': webs.externalApp}
+                package = {'name': itemPackage.packageName, 'owner': webs.admin.userName}
 
                 user = {}
 
@@ -92,7 +92,7 @@ class CloudLinuxUsers(CLMain):
                     user['username'] = webs.externalApp
 
                 if self.ow:
-                    user['owner'] = webs.externalApp
+                    user['owner'] = webs.admin.userName
 
                 if self.domain:
                     user['domain'] = webs.domain
@@ -133,7 +133,7 @@ class CloudLinuxUsers(CLMain):
         if self.owner == None:
             websites = Websites.objects.all()
         else:
-            websites = Websites.objects.filter(externalApp=self.owner)
+            websites = Websites.objects.filter(admin__userName=self.owner)
 
         if self.username != None:
             websites = websites.filter(externalApp=self.username)