Improve oauth process