Moved password to set and unset for consistency