Fixed Issues with OAuth