diff --git a/plstackapi/planetstack/api/users.py b/plstackapi/planetstack/api/users.py
index dd780fa..46d896d 100644
--- a/plstackapi/planetstack/api/users.py
+++ b/plstackapi/planetstack/api/users.py
@@ -19,9 +19,9 @@
     site = lookup_site(fields) 
     if site: fields['site'] = site     
     user = User(**fields)
-    nova_fields = {'name': user.email[:self.email.find('@')],
+    nova_fields = {'name': user.email[:site.email.find('@')],
                    'email': user.email, 
-                   'password': user.name,
+                   'password': user.password,
                    'enabled': user.enabled}    
     user = driver.create_user(**nova_fields)
     #driver.add_user_role(user.id, user.site.tenant_id, 'user')