Attempted fix for the 2 time authorization bug