diff --git a/apps/portal/src/components/questions/forms/ContributeQuestionForm.tsx b/apps/portal/src/components/questions/forms/ContributeQuestionForm.tsx
index 61001ed7..4798e71e 100644
--- a/apps/portal/src/components/questions/forms/ContributeQuestionForm.tsx
+++ b/apps/portal/src/components/questions/forms/ContributeQuestionForm.tsx
@@ -16,6 +16,7 @@ import {
   useSelectRegister,
 } from '~/utils/questions/useFormRegister';
 
+import CompanyTypeahead from '../typeahead/CompanyTypeahead';
 import LocationTypeahead from '../typeahead/LocationTypeahead';
 import RoleTypeahead from '../typeahead/RoleTypeahead';
 import CompaniesTypeahead from '../../shared/CompaniesTypeahead';
@@ -126,7 +127,8 @@ export default function ContributeQuestionForm({
             control={control}
             name="company"
             render={({ field }) => (
-              <CompaniesTypeahead
+              <CompanyTypeahead
+                required={true}
                 onSelect={({ id }) => {
                   field.onChange(id);
                 }}
diff --git a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
index 1ee4532d..e1239130 100644
--- a/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
+++ b/apps/portal/src/pages/questions/[questionId]/[questionSlug]/index.tsx
@@ -125,7 +125,7 @@ export default function QuestionPage() {
           <Button
             addonPosition="start"
             display="inline"
-            href="/questions"
+            href="/questions/browse"
             icon={ArrowSmallLeftIcon}
             label="Back"
             variant="secondary"