Remove null contraint for oauth performance