Add support for normal authentication besides oAuth

User can login by username & password besides oAuth