Added alternative HTML authentication
Merge