Added flag to check for PW before allowing add