Added overriding of user id