Fixed the user id issue