Merge "new password shouldn't be empty string"