Fixed checking the user