Adding support to User+Password authentication