Removed user check again