Revert "Changed current_user check from an '&&' to a '||' check"

This reverts commit dcc469f067c33a04810a97a40be4c80917436e1d.