Added check for unconfirmed/inactive users
Tests working again