Merged password fields into a single text field
Improved login code and templates