Merge "Make sure user dict has id key before checking against it"

1 files changed, 1 insertions, 1 deletions

diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index c324de80..b0ed154e 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -359,7 +359,7 @@ class Identity(sql.Base, identity.Driver):
     @handle_conflicts(type='user')
     def update_user(self, user_id, user):
         session = self.get_session()
-        if user_id != user['id']:
+        if 'id' in user and user_id != user['id']:
             raise exception.ValidationError('Cannot change user ID')
         with session.begin():
             user_ref = session.query(User).filter_by(id=user_id).first()