diff --git a/sama_chat_client/lib/src/features/login/view/login_form.dart b/sama_chat_client/lib/src/features/login/view/login_form.dart
index 6f91973..68463af 100644
--- a/sama_chat_client/lib/src/features/login/view/login_form.dart
+++ b/sama_chat_client/lib/src/features/login/view/login_form.dart
@@ -240,7 +240,7 @@ class _EmailInput extends StatelessWidget {
                 ? state.email.displayError == EmailValidationError.empty
                     ? 'Email is too short'
                     : state.email.displayError == EmailValidationError.incorrect
-                        ? 'The format of the email address is incorrect'
+                        ? 'The format of the email is incorrect'
                         : null
                 : null);
       },
diff --git a/sama_chat_client/lib/src/features/profile/view/profile_form.dart b/sama_chat_client/lib/src/features/profile/view/profile_form.dart
index 3da03f1..6a2a645 100644
--- a/sama_chat_client/lib/src/features/profile/view/profile_form.dart
+++ b/sama_chat_client/lib/src/features/profile/view/profile_form.dart
@@ -532,7 +532,7 @@ class InfoDialogInput extends StatelessWidget {
                       ),
                       errorText: state.userEmail.displayError ==
                               UserEmailValidationError.incorrect
-                          ? 'The format of the email address is incorrect.'
+                          ? 'The format of the email is incorrect.'
                           : null,
                     ),
                   ),
diff --git a/sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart b/sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart
index 40b7a2d..0f4e629 100644
--- a/sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart
+++ b/sama_chat_client/lib/src/features/reset_password/view/send_email_form.dart
@@ -28,12 +28,13 @@ class SendEmailForm extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          const Text('Reset password'),
+          const Text('Reset password', style: TextStyle(fontSize: 20)),
           const Padding(padding: EdgeInsets.all(8)),
           const Text(
               'To reset your password, enter the email that you used to create your account',
+              textAlign: TextAlign.center,
               style: TextStyle(
-                fontSize: 12,
+                fontSize: 14,
               )),
           const Padding(padding: EdgeInsets.all(8)),
           _EmailInput(),
@@ -63,7 +64,7 @@ class _EmailInput extends StatelessWidget {
                 ? state.email.displayError == EmailValidationError.empty
                     ? 'Email is too short'
                     : state.email.displayError == EmailValidationError.incorrect
-                        ? 'The format of the email address is incorrect'
+                        ? 'The format of the email is incorrect'
                         : null
                 : null);
       },
diff --git a/sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart b/sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart
index 8413852..f1cf83b 100644
--- a/sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart
+++ b/sama_chat_client/lib/src/features/reset_password/view/send_otp_form.dart
@@ -28,13 +28,13 @@ class SendOtpForm extends StatelessWidget {
       return Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          const Text('Reset password'),
+          const Text('Reset password', style: TextStyle(fontSize: 20)),
           const Padding(padding: EdgeInsets.all(8)),
           Text(
               'We have sent a verification code to ${context.read<ResetPasswordBloc>().state.email.value}',
               textAlign: TextAlign.center,
               style: const TextStyle(
-                fontSize: 12,
+                fontSize: 14,
               )),
           const Padding(padding: EdgeInsets.all(8)),
           const OtpInput(),
@@ -127,10 +127,11 @@ class OtpInputState extends State<OtpInput> {
         ),
         const Padding(
           padding: EdgeInsets.all(8.0),
-          child: Text(
-            "Enter the 6 digit OTP sent to your email",
-            textAlign: TextAlign.center,
-          ),
+          child: Text("Enter the 6 digit OTP sent to your email",
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                fontSize: 16,
+              )),
         ),
         Padding(
           padding: const EdgeInsets.all(8.0),
diff --git a/sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart b/sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart
index 9d5b39e..9b48acd 100644
--- a/sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart
+++ b/sama_chat_client/lib/src/features/reset_password/view/send_reset_password_form.dart
@@ -35,7 +35,7 @@ class SendResetPasswordForm extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          const Text('Set new password'),
+          const Text('Set new password', style: TextStyle(fontSize: 20)),
           const Padding(padding: EdgeInsets.all(8)),
           _PasswordInput(),
           const Padding(padding: EdgeInsets.all(8)),
diff --git a/sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart b/sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart
index 47822a4..699a0db 100644
--- a/sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart
+++ b/sama_chat_client/lib/src/shared/ui/view/text_button_forms.dart
@@ -40,9 +40,6 @@ class TextFieldForm extends StatelessWidget {
           onChanged: (username) => onChanged(username),
           decoration: InputDecoration(
             border: InputBorder.none,
-            floatingLabelBehavior: error != null
-                ? FloatingLabelBehavior.never
-                : FloatingLabelBehavior.auto,
             contentPadding: const EdgeInsets.only(left: 12.0),
             isDense: true,
             label: Row(
@@ -53,13 +50,15 @@ class TextFieldForm extends StatelessWidget {
                   size: 26,
                   color: dullGray,
                 ),
-                Text(
-                  hint,
-                  style: const TextStyle(color: dullGray, fontSize: 16),
-                )
+                Expanded(
+                    child: Text(
+                  error ?? hint,
+                  style: TextStyle(
+                      color: error != null ? red : dullGray, fontSize: 16),
+                  overflow: TextOverflow.ellipsis,
+                ))
               ],
             ),
-            errorText: error,
             suffixIcon: Padding(
               padding: const EdgeInsets.only(right: 8),
               child: suffix ?? const SizedBox(),