Fix for user active only