Made OAuth callback more dynamic