Add no user check