bugfix & password encryption