Update User options for creation and update

Fixes #246

1 files changed, 7 insertions, 6 deletions

diff --git a/gitlab/objects.py b/gitlab/objects.py
index 071173b..8c8e5d9 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -614,16 +614,17 @@ class UserProjectManager(BaseManager):
 class User(GitlabObject):
     _url = '/users'
     shortPrintAttr = 'username'
-    requiredCreateAttrs = ['email', 'username', 'name', 'password']
-    optionalCreateAttrs = ['skype', 'linkedin', 'twitter', 'projects_limit',
-                           'extern_uid', 'provider', 'bio', 'admin',
-                           'can_create_group', 'website_url', 'confirm',
-                           'external']
+    requiredCreateAttrs = ['email', 'username', 'name']
+    optionalCreateAttrs = ['password', 'reset_password', 'skype', 'linkedin',
+                           'twitter', 'projects_limit', 'extern_uid',
+                           'provider', 'bio', 'admin', 'can_create_group',
+                           'website_url', 'confirm', 'external',
+                           'organization', 'location']
     requiredUpdateAttrs = ['email', 'username', 'name']
     optionalUpdateAttrs = ['password', 'skype', 'linkedin', 'twitter',
                            'projects_limit', 'extern_uid', 'provider', 'bio',
                            'admin', 'can_create_group', 'website_url',
-                           'confirm', 'external']
+                           'confirm', 'external', 'organization', 'location']
     managers = (
         ('emails', UserEmailManager, [('user_id', 'id')]),
         ('keys', UserKeyManager, [('user_id', 'id')]),