Workaround for login issues