Fix current_user_from