diff --git a/resources/assets/js/views/auth/ResetPassword.vue b/resources/assets/js/views/auth/ResetPassword.vue
index 286bc688..11ba1c60 100644
--- a/resources/assets/js/views/auth/ResetPassword.vue
+++ b/resources/assets/js/views/auth/ResetPassword.vue
@@ -1,47 +1,57 @@
 <template>
   <form id="loginForm" @submit.prevent="validateBeforeSubmit">
-    <div class="form-group">
-      <sw-input
-        v-model.trim="formData.email"
-        :invalid="$v.formData.email.$error"
-        :placeholder="$t('login.enter_email')"
-        type="email"
-        name="email"
-        @input="$v.formData.email.$touch()"
-      />
+    <div class="mb-4 form-group">
+      <sw-input-group :label="$t('login.email')" required>
+        <sw-input
+          v-model.trim="formData.email"
+          :invalid="$v.formData.email.$error"
+          :placeholder="$t('login.enter_email')"
+          type="email"
+          name="email"
+          @input="$v.formData.email.$touch()"
+        />
+      </sw-input-group>
       <div v-if="$v.formData.email.$error">
-        <span v-if="!$v.formData.email.required" class="help-block text-danger">
+        <span
+          v-if="!$v.formData.email.required"
+          class="text-sm help-block text-danger"
+        >
           {{ $t('validation.required') }}
         </span>
-        <span v-if="!$v.formData.email.email" class="help-block text-danger">
+        <span
+          v-if="!$v.formData.email.email"
+          class="text-sm help-block text-danger"
+        >
           {{ $t('validation.email_incorrect') }}
         </span>
       </div>
     </div>
-    <div class="form-group">
-      <sw-input
-        id="password"
-        v-model.trim="formData.password"
-        :invalid="$v.formData.password.$error"
-        :placeholder="$t('login.enter_password')"
-        type="password"
-        name="password"
-        @input="$v.formData.password.$touch()"
-      />
+    <div class="mb-4 form-group">
+      <sw-input-group :label="$t('login.password')" required>
+        <sw-input
+          id="password"
+          v-model.trim="formData.password"
+          :invalid="$v.formData.password.$error"
+          :placeholder="$t('login.enter_password')"
+          type="password"
+          name="password"
+          @input="$v.formData.password.$touch()"
+        />
+      </sw-input-group>
       <div v-if="$v.formData.password.$error">
         <span
           v-if="!$v.formData.password.required"
-          class="help-block text-danger"
+          class="text-sm help-block text-danger"
         >
           {{ $t('validation.required') }}
         </span>
         <span
           v-if="!$v.formData.password.minLength"
-          class="help-block text-danger"
+          class="text-sm help-block text-danger"
         >
           {{
             $tc(
-              'validation.password_length',
+              'validation.password_length ',
               $v.formData.password.minLength.min,
               { count: $v.formData.password.$params.minLength.min }
             )
@@ -49,19 +59,21 @@
         </span>
       </div>
     </div>
-    <div class="form-group">
-      <sw-input
-        v-model.trim="formData.password_confirmation"
-        :invalid="$v.formData.password_confirmation.$error"
-        :placeholder="$t('login.retype_password')"
-        type="password"
-        name="password_confirmation"
-        @input="$v.formData.password_confirmation.$touch()"
-      />
+    <div class="mb-8 form-group">
+      <sw-input-group :label="$t('login.retype_password')" required>
+        <sw-input
+          v-model.trim="formData.password_confirmation"
+          :invalid="$v.formData.password_confirmation.$error"
+          :placeholder="$t('login.retype_password')"
+          type="password"
+          name="password_confirmation"
+          @input="$v.formData.password_confirmation.$touch()"
+        />
+      </sw-input-group>
       <div v-if="$v.formData.password_confirmation.$error">
         <span
           v-if="!$v.formData.password_confirmation.sameAsPassword"
-          class="help-block text-danger"
+          class="text-sm help-block text-danger"
         >
           {{ $t('validation.password_incorrect') }}
         </span>