Fix current_user being nil