Add support for user[name] and password