Never depend on hardcoded user login
Added the audit datastream