removed check about user disabled