[CHANGE] cleaner way of disabling and enabling auth;