Added username field to registration form; update login copy