Couple of hot fixes due to Express upgrade problem

Just reverted because of Express 4 / Passport.js issues, to make this
older version live until the new version is working.