added password input
template improvements