add defaults, and password encryption of password