diff --git a/website/client/src/components/challenges/challengeModal.vue b/website/client/src/components/challenges/challengeModal.vue
index abf98b0b2c..2861e83498 100644
--- a/website/client/src/components/challenges/challengeModal.vue
+++ b/website/client/src/components/challenges/challengeModal.vue
@@ -12,7 +12,8 @@
         <label>
           <strong v-once>{{ $t('name') }} *</strong>
         </label>
-        <b-form-input
+        <input
+          class="form-control"
           v-model="workingChallenge.name"
           type="text"
           :placeholder="$t('challengeNamePlaceholder')"
@@ -23,7 +24,8 @@
         <label>
           <strong v-once>{{ $t('shortName') }} *</strong>
         </label>
-        <b-form-input
+        <input
+          class="form-control"
           v-model="workingChallenge.shortName"
           type="text"
           :placeholder="$t('shortNamePlaceholder')"
@@ -141,9 +143,6 @@
           </button>
         </div>
       </div>
-      <!-- @TODO: Implement in V2 .form-grouplabel
-  strong(v-once) {{$t('endDate')}}
-      b-form-input.end-date-input-->
       <div
         v-if="creating"
         class="form-group"
diff --git a/website/client/src/components/groups/groupFormModal.vue b/website/client/src/components/groups/groupFormModal.vue
index a7e4e3ad28..941b83af13 100644
--- a/website/client/src/components/groups/groupFormModal.vue
+++ b/website/client/src/components/groups/groupFormModal.vue
@@ -10,7 +10,8 @@
         <label>
           <strong v-once>{{ $t('name') }} *</strong>
         </label>
-        <b-form-input
+        <input
+          class="form-control"
           v-model="workingGroup.name"
           type="text"
           :placeholder="isParty ? $t('newPartyPlaceholder') : $t('newGuildPlaceholder')"
diff --git a/website/client/src/components/tasks/modal-controls/selectMulti.vue b/website/client/src/components/tasks/modal-controls/selectMulti.vue
index 922ef7d151..ed0b508d24 100644
--- a/website/client/src/components/tasks/modal-controls/selectMulti.vue
+++ b/website/client/src/components/tasks/modal-controls/selectMulti.vue
@@ -10,7 +10,8 @@
     >
       <b-dropdown-header>
         <div class="mb-2">
-          <b-form-input
+          <input
+          class="form-control"
             v-model="search"
             type="text"
             :placeholder="searchPlaceholder"
diff --git a/website/client/src/components/tasks/modal-controls/selectSingle.vue b/website/client/src/components/tasks/modal-controls/selectSingle.vue
index fddae5b0ac..5a7324ee89 100644
--- a/website/client/src/components/tasks/modal-controls/selectSingle.vue
+++ b/website/client/src/components/tasks/modal-controls/selectSingle.vue
@@ -11,7 +11,8 @@
     >
       <b-dropdown-header>
         <div class="mb-2">
-          <b-form-input
+          <input
+          class="form-control"
             v-model="search"
             type="text"
             :placeholder="searchPlaceholder"
diff --git a/website/client/src/main.js b/website/client/src/main.js
index e1096cc061..97db7c0b63 100644
--- a/website/client/src/main.js
+++ b/website/client/src/main.js
@@ -4,9 +4,6 @@ import {
   ModalPlugin,
   DropdownPlugin,
   PopoverPlugin,
-  FormPlugin,
-  FormInputPlugin,
-  FormRadioPlugin,
   TooltipPlugin,
   NavbarPlugin,
   CollapsePlugin,
@@ -38,9 +35,6 @@ Vue.use(StoreModule);
 Vue.use(ModalPlugin);
 Vue.use(DropdownPlugin);
 Vue.use(PopoverPlugin);
-Vue.use(FormPlugin);
-Vue.use(FormInputPlugin);
-Vue.use(FormRadioPlugin);
 Vue.use(TooltipPlugin);
 Vue.use(NavbarPlugin);
 Vue.use(CollapsePlugin);