Modifications to try to get the signin working as intended