diff --git a/src/app/actions/definitions.ts b/src/app/actions/definitions.ts
index fc37101..f1696cd 100644
--- a/src/app/actions/definitions.ts
+++ b/src/app/actions/definitions.ts
@@ -24,6 +24,10 @@ export const SignupFormSchema = z
 			.string()
 			.min(2, { error: 'register-error-name' })
 			.regex(/^[^0-9]*$/, { message: 'register-error-no-digits' })
+			.refine(
+				(value) => !/\p{Emoji}/u.test(value),
+				{ message: 'no-emoji-allowed' }
+			)
 			.trim(),
 		email: z
 			.string()
@@ -44,6 +48,10 @@ export const SignupFormSchema = z
 			.min(8, { error: 'register-error-password-symbols' })
 			.regex(/[a-zA-Zа-яёА-ЯЁ]/, { error: 'register-error-password-one-letter' })
 			.regex(/[0-9]/, { error: 'register-error-password-one-digit' })
+			.refine(
+				(value) => !/\p{Emoji}/u.test(value),
+				{ message: 'no-emoji-allowed' }
+			)
 			.trim(),
 		confirm_password: z
 			.string(),
diff --git a/src/app/styles/global-styles.scss b/src/app/styles/global-styles.scss
index d50d878..7f3d1a1 100644
--- a/src/app/styles/global-styles.scss
+++ b/src/app/styles/global-styles.scss
@@ -97,8 +97,9 @@
 .show-password-button {
 	cursor: pointer;
 	position: absolute;
-	top: 0px;
-	right: 6px;
+	top: 50%;
+	right: 10px;
+	transform: translateY(-50%);
 
 	svg {
 		width: 16px;
@@ -108,7 +109,7 @@
 
 	&.show {
 		svg {
-			color: black;
+			color: #8b5cf6;
 		}
 	}
 }
diff --git a/src/app/styles/login.module.scss b/src/app/styles/login.module.scss
index e8c24d2..1a05048 100644
--- a/src/app/styles/login.module.scss
+++ b/src/app/styles/login.module.scss
@@ -75,6 +75,10 @@
 	&[type="password"]::-ms-reveal {
 		display: none;
 	}
+
+	&.password {
+		padding-right: 32px;
+	}
 }
 
 .form-options {
diff --git a/src/app/ui/forms/login-form.tsx b/src/app/ui/forms/login-form.tsx
index ca03334..9c534cd 100644
--- a/src/app/ui/forms/login-form.tsx
+++ b/src/app/ui/forms/login-form.tsx
@@ -42,6 +42,9 @@ export default function LoginForm() {
 					className={`${styles['form-input']}`}
 					placeholder={t('enter-email')}
 					defaultValue={state?.previousState?.email ? state?.previousState?.email : ''}
+					onChange={(e) => {
+						e.target.value = e.target.value.toLocaleLowerCase();
+					}}
 				/>
 				{state?.error?.email && (
 					<p className={`${styles['form-error']}`}>
@@ -58,7 +61,7 @@ export default function LoginForm() {
 						type={showPassword ? "text" : "password"}
 						id="password"
 						name="password"
-						className={`${styles['form-input']}`}
+						className={`${styles['form-input']} ${styles['password']}`}
 						placeholder={t('enter-password')}
 					/>
 					<button
diff --git a/src/app/ui/forms/register-form.tsx b/src/app/ui/forms/register-form.tsx
index 71fa2c2..192ed6a 100644
--- a/src/app/ui/forms/register-form.tsx
+++ b/src/app/ui/forms/register-form.tsx
@@ -26,28 +26,11 @@ export default function RegisterForm() {
 		setFormState(state);
 	}, [state])
 
-	function handleMouseDown(target: 'password' | 'confirm-password') {
+	function showPassowrd(target: 'password' | 'confirm-password') {
 		if (target === 'password') {
-			setShowPassword(true);
+			setShowPassword(!showPassword);
 		} else {
-			setShowConfirmPassword(true);
-		}
-	}
-
-	function handleMouseUp(target: 'password' | 'confirm-password') {
-		if (target === 'password') {
-			setShowPassword(false);
-		} else {
-			setShowConfirmPassword(false);
-		}
-
-	}
-
-	function handleMouseOut(target: 'password' | 'confirm-password') {
-		if (target === 'password') {
-			setShowPassword(false);
-		} else {
-			setShowConfirmPassword(false);
+			setShowConfirmPassword(!showConfirmPassword);
 		}
 	}
 
@@ -145,42 +128,45 @@ export default function RegisterForm() {
 					</p>
 				)}
 			</div>
-			<div className={`${styles['form-row']}`}>
-				<div className={`${styles['form-group']}`}>
-					<label className={`${styles['form-label']} ${styles['required']}`}>
-						{t('email-adress')}
-					</label>
-					<input
-						type="text"
-						id="email"
-						name="email"
-						className={`${styles['form-input']}`}
-						placeholder="ivan@example.com"
-						defaultValue={formState?.previousState?.email ? formState?.previousState?.email : ''}
-						onChange={onChangeHandler}
-					/>
-					{formState?.error?.email && (
-						<p className="text-sm text-red-500">
-							{
-								formState?.error?.email.split('&').map((e) => {
-									return t(e) + " "
-								})
-							}
-						</p>
-					)}
-				</div>
-				<div className={`${styles['form-group']}`}>
-					<label className={`${styles['form-label']} ${styles['required']}`}>
-						{t('phone')}
-					</label>
-					<PhoneInput phoneState={formState?.previousState?.phone} validateHandler={onChangeHandler} />
-					{formState?.error?.phone && (
-						<p className="text-sm text-red-500">
-							{t(formState?.error?.phone)}
-						</p>
-					)}
-				</div>
+
+			<div className={`${styles['form-group']}`}>
+				<label className={`${styles['form-label']} ${styles['required']}`}>
+					{t('email-adress')}
+				</label>
+				<input
+					type="text"
+					id="email"
+					name="email"
+					className={`${styles['form-input']}`}
+					placeholder="ivan@example.com"
+					defaultValue={formState?.previousState?.email ? formState?.previousState?.email : ''}
+					onChange={(e) => {
+						e.target.value = e.target.value.toLocaleLowerCase();
+						onChangeHandler(e)
+					}}
+				/>
+				{formState?.error?.email && (
+					<p className="text-sm text-red-500">
+						{
+							formState?.error?.email.split('&').map((e) => {
+								return t(e) + " "
+							})
+						}
+					</p>
+				)}
 			</div>
+			<div className={`${styles['form-group']}`}>
+				<label className={`${styles['form-label']} ${styles['required']}`}>
+					{t('phone')}
+				</label>
+				<PhoneInput phoneState={formState?.previousState?.phone} validateHandler={onChangeHandler} />
+				{formState?.error?.phone && (
+					<p className="text-sm text-red-500">
+						{t(formState?.error?.phone)}
+					</p>
+				)}
+			</div>
+
 			<div className={`${styles['form-group']}`}>
 				<label
 					className={`${styles['form-label']}`}
@@ -196,86 +182,75 @@ export default function RegisterForm() {
 					defaultValue={formState?.previousState?.companyName ? formState?.previousState?.companyName : ''}
 				/>
 			</div>
-			<div className={`${styles['form-row']}`}>
-				<div className={`${styles['form-group']}`}>
-					<label className={`${styles['form-label']} ${styles['required']}`}>
-						{t('password')}
-					</label>
-					<div
-						className={`${styles['password-wrapper']}`}
+
+			<div className={`${styles['form-group']}`}>
+				<label className={`${styles['form-label']} ${styles['required']}`}>
+					{t('password')}
+				</label>
+				<div
+					className={`${styles['password-wrapper']}`}
+				>
+					<input
+						ref={passwordRef}
+						type={showPassword ? "text" : "password"}
+						id="password"
+						name="password"
+						className={`${styles['form-input']} ${styles['password']}`}
+						placeholder={t('password-placeholder')}
+						defaultValue={formState?.previousState?.password ? formState?.previousState?.password : ''}
+						onChange={onChangeHandler}
+					/>
+					<button
+						onClick={() => {
+							showPassowrd('password')
+						}}
+						type="button"
+						className={`show-password-button ${showPassword ? 'show' : ''}`}
 					>
-						<input
-							ref={passwordRef}
-							type={showPassword ? "text" : "password"}
-							id="password" name="password"
-							className={`${styles['form-input']}`}
-							placeholder={t('password-placeholder')}
-							defaultValue={formState?.previousState?.password ? formState?.previousState?.password : ''}
-							onChange={onChangeHandler}
-						/>
-						<button
-							onMouseDown={() => {
-								handleMouseDown('password');
-							}}
-							onMouseUp={() => {
-								handleMouseUp('password');
-							}}
-							onMouseOut={() => {
-								handleMouseOut('password')
-							}}
-							type="button"
-							className={`show-password-button ${showPassword ? 'show' : ''}`}
-						>
-							<IconEye />
-						</button>
-					</div>
-					{formState?.error?.password && (
-						<p className="text-sm text-red-500">
-							{
-								formState?.error?.password.split('&').map((e) => {
-									return t(e)
-								})
-							}
-						</p>
-					)}
-				</div>
-				<div className={`${styles['form-group']}`}>
-					<label className={`${styles['form-label']} ${styles['required']}`}>
-						{t('confirm-password')}
-					</label>
-					<div className={`${styles['password-wrapper']}`}>
-						<input
-							type={showConfirmPassword ? "text" : "password"}
-							id="confirm_password"
-							name="confirm_password"
-							className={`${styles['form-input']}`}
-							placeholder={t('repeat-password')}
-							defaultValue={formState?.previousState?.confirm_password ? formState?.previousState?.confirm_password : ''}
-							onChange={onChangeHandler}
-						/>
-						<button
-							onMouseDown={() => {
-								handleMouseDown('confirm-password');
-							}}
-							onMouseUp={() => {
-								handleMouseUp('confirm-password');
-							}}
-							onMouseOut={() => {
-								handleMouseOut('confirm-password');
-							}}
-							type="button"
-							className={`show-password-button ${showPassword ? 'show' : ''}`}
-						>
-							<IconEye />
-						</button>
-					</div>
-					{formState?.error?.confirm_password && (
-						<p className="text-sm text-red-500">
-							{t(formState?.error?.confirm_password)}
-						</p>
-					)}
+						<IconEye />
+					</button>
 				</div>
+				{formState?.error?.password && (
+					<p className="text-sm text-red-500">
+						{
+							formState?.error?.password.split('&').map((e) => {
+								return t(e)
+							})
+						}
+					</p>
+				)}
 			</div>
+			<div className={`${styles['form-group']}`}>
+				<label className={`${styles['form-label']} ${styles['required']}`}>
+					{t('confirm-password')}
+				</label>
+				<div className={`${styles['password-wrapper']}`}>
+					<input
+						type={showConfirmPassword ? "text" : "password"}
+						id="confirm_password"
+						name="confirm_password"
+						className={`${styles['form-input']} ${styles['password']}`}
+						placeholder={t('repeat-password')}
+						defaultValue={formState?.previousState?.confirm_password ? formState?.previousState?.confirm_password : ''}
+						onChange={onChangeHandler}
+					/>
+					<button
+						onClick={() => {
+							showPassowrd('confirm-password');
+						}}
+						type="button"
+						className={`show-password-button ${showConfirmPassword ? 'show' : ''}`}
+					>
+						<IconEye />
+					</button>
+				</div>
+				{formState?.error?.confirm_password && (
+					<p className="text-sm text-red-500">
+						{t(formState?.error?.confirm_password)}
+					</p>
+				)}
+			</div>
+
 			<div className={`${styles['form-checkbox']}`}>
 				<input
 					type="checkbox"
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 5d4b59a..ef00ba2 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -170,6 +170,7 @@
 		"email-invalid": "Invalid email address",
 		"email-too-long": "Email is too long",
 		"password-too-long": "Password must be less than 50 characters",
-		"email-no-uppercase": "Email must not contain capital letters"
+		"email-no-uppercase": "Email must not contain capital letters.",
+		"no-emoji-allowed": "The use of emoji is prohibited."
 	}
 }
\ No newline at end of file
diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json
index 99c5299..a7fcdfb 100644
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -170,6 +170,7 @@
 		"email-invalid": "Неверный адрес электронной почты",
 		"email-too-long": "Email слишком длинный.",
 		"password-too-long": "Пароль должен содержать менее 50 символов.",
-		"email-no-uppercase": "Email не должен содержать заглавных букв"
+		"email-no-uppercase": "Email не должен содержать заглавных букв.",
+		"no-emoji-allowed": "Использование эмодзи запрещено."
 	}
 }
\ No newline at end of file