Possibly Fixed some issues with authentication