Issue #327 - Better password security
Fixed issues when upgrading from older version.