Fixed user check issue