Password is now null instead of "none" when no password is set