diff --git a/frontend/src/components/common/fields/username-field.tsx b/frontend/src/components/common/fields/username-field.tsx
index 917b909fb..175d1433d 100644
--- a/frontend/src/components/common/fields/username-field.tsx
+++ b/frontend/src/components/common/fields/username-field.tsx
@@ -4,42 +4,38 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 import type { CommonFieldProps } from './fields'
-import React, { useMemo } from 'react'
+import React from 'react'
 import { Form } from 'react-bootstrap'
-import { Trans, useTranslation } from 'react-i18next'
+import { useTranslation } from 'react-i18next'
+
+export interface UsernameFieldProps extends CommonFieldProps {
+  isInvalid?: boolean
+  isValid?: boolean
+}
 
 /**
  * Renders an input field for the username when registering.
  *
- * @param onChange Hook that is called when the entered username changes.
+ * @param onChange Callback that is called when the entered username changes.
  * @param value The currently entered username.
+ * @param isValid  Is a valid field or not
+ * @param isInvalid Adds error style to label
  */
-export const UsernameField: React.FC<CommonFieldProps> = ({ onChange, value }) => {
+export const UsernameField: React.FC<UsernameFieldProps> = ({ onChange, value, isValid, isInvalid }) => {
   const { t } = useTranslation()
 
-  const isValid = useMemo(() => {
-    return value?.trim() !== ''
-  }, [value])
-
   return (
-    <Form.Group>
-      <Form.Label>
-        <Trans i18nKey='login.auth.username' />
-      </Form.Label>
-      <Form.Control
-        type='text'
-        size='sm'
-        value={value}
-        isValid={isValid}
-        onChange={onChange}
-        placeholder={t('login.auth.username') ?? undefined}
-        autoComplete='username'
-        autoFocus={true}
-        required
-      />
-      <Form.Text>
-        <Trans i18nKey='login.register.usernameInfo' />
-      </Form.Text>
-    </Form.Group>
+    <Form.Control
+      type='text'
+      size='sm'
+      value={value}
+      isValid={isValid}
+      isInvalid={isInvalid}
+      onChange={onChange}
+      placeholder={t('login.auth.username') ?? undefined}
+      autoComplete='username'
+      autoFocus={true}
+      required
+    />
   )
 }
diff --git a/frontend/src/components/common/fields/username-label-field.tsx b/frontend/src/components/common/fields/username-label-field.tsx
new file mode 100644
index 000000000..675e89222
--- /dev/null
+++ b/frontend/src/components/common/fields/username-label-field.tsx
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+import { UsernameField } from './username-field'
+import type { UsernameFieldProps } from './username-field'
+import React from 'react'
+import { Form } from 'react-bootstrap'
+import { Trans } from 'react-i18next'
+
+/**
+ * Wraps and contains label and info for UsernameField
+ *
+ * @param onChange Callback that is called when the entered username changes.
+ * @param value The currently entered username.
+ * @param isValid  Is a valid field or not
+ * @param isInvalid Adds error style to label
+ */
+export const UsernameLabelField: React.FC<UsernameFieldProps> = (props) => {
+  return (
+    <Form.Group>
+      <Form.Label>
+        <Trans i18nKey='login.auth.username' />
+      </Form.Label>
+      <UsernameField {...props} />
+      <Form.Text>
+        <Trans i18nKey='login.register.usernameInfo' />
+      </Form.Text>
+    </Form.Group>
+  )
+}
diff --git a/frontend/src/components/login-page/auth/fields/username-field.tsx b/frontend/src/components/login-page/auth/fields/username-field.tsx
deleted file mode 100644
index 0179e1362..000000000
--- a/frontend/src/components/login-page/auth/fields/username-field.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file)
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-import type { AuthFieldProps } from './fields'
-import React from 'react'
-import { Form } from 'react-bootstrap'
-import { useTranslation } from 'react-i18next'
-
-export interface UsernameFieldProps extends AuthFieldProps {
-  value: string
-}
-
-//TODO: This should be replaced with the common username component. See https://github.com/hedgedoc/hedgedoc/issues/4128
-/**
- * Renders an input field for a username.
- *
- * @param onChange Hook that is called when the input is changed.
- * @param invalid True indicates that the username is invalid, false otherwise.
- * @param value the username value
- */
-export const UsernameField: React.FC<UsernameFieldProps> = ({ onChange, invalid, value }) => {
-  const { t } = useTranslation()
-
-  return (
-    <Form.Group>
-      <Form.Control
-        isInvalid={invalid}
-        value={value}
-        type='text'
-        size='sm'
-        placeholder={t('login.auth.username') ?? undefined}
-        onChange={onChange}
-        autoComplete='username'
-      />
-    </Form.Group>
-  )
-}
diff --git a/frontend/src/components/login-page/auth/via-ldap.tsx b/frontend/src/components/login-page/auth/via-ldap.tsx
index 3b28d99e5..d3dcc1a72 100644
--- a/frontend/src/components/login-page/auth/via-ldap.tsx
+++ b/frontend/src/components/login-page/auth/via-ldap.tsx
@@ -6,8 +6,8 @@
 import { doLdapLogin } from '../../../api/auth/ldap'
 import { useLowercaseOnInputChange } from '../../../hooks/common/use-lowercase-on-input-change'
 import { useOnInputChange } from '../../../hooks/common/use-on-input-change'
+import { UsernameField } from '../../common/fields/username-field'
 import { PasswordField } from './fields/password-field'
-import { UsernameField } from './fields/username-field'
 import { fetchAndSetUser } from './utils'
 import type { FormEvent } from 'react'
 import React, { useCallback, useState } from 'react'
@@ -49,7 +49,7 @@ export const ViaLdap: React.FC<ViaLdapProps> = ({ providerName, identifier }) =>
           <Trans i18nKey='login.signInVia' values={{ service: providerName }} />
         </Card.Title>
         <Form onSubmit={onLoginSubmit}>
-          <UsernameField onChange={onUsernameChange} invalid={!!error} value={username} />
+          <UsernameField onChange={onUsernameChange} isValid={!!error} value={username} />
           <PasswordField onChange={onPasswordChange} invalid={!!error} />
           <Alert className='small' show={!!error} variant='danger'>
             <Trans i18nKey={error} />
diff --git a/frontend/src/components/login-page/auth/via-local.tsx b/frontend/src/components/login-page/auth/via-local.tsx
index 29aef0ffa..e506aa129 100644
--- a/frontend/src/components/login-page/auth/via-local.tsx
+++ b/frontend/src/components/login-page/auth/via-local.tsx
@@ -7,10 +7,10 @@ import { doLocalLogin } from '../../../api/auth/local'
 import { ErrorToI18nKeyMapper } from '../../../api/common/error-to-i18n-key-mapper'
 import { useLowercaseOnInputChange } from '../../../hooks/common/use-lowercase-on-input-change'
 import { useOnInputChange } from '../../../hooks/common/use-on-input-change'
+import { UsernameField } from '../../common/fields/username-field'
 import { useFrontendConfig } from '../../common/frontend-config-context/use-frontend-config'
 import { ShowIf } from '../../common/show-if/show-if'
 import { PasswordField } from './fields/password-field'
-import { UsernameField } from './fields/username-field'
 import { fetchAndSetUser } from './utils'
 import Link from 'next/link'
 import type { FormEvent } from 'react'
@@ -55,7 +55,7 @@ export const ViaLocal: React.FC = () => {
           <Trans i18nKey='login.signInVia' values={{ service: t('login.auth.username') }} />
         </Card.Title>
         <Form onSubmit={onLoginSubmit} className={'d-flex gap-3 flex-column'}>
-          <UsernameField onChange={onUsernameChange} invalid={!!error} value={username} />
+          <UsernameField onChange={onUsernameChange} isInvalid={!!error} value={username} />
           <PasswordField onChange={onPasswordChange} invalid={!!error} />
           <Alert className='small' show={!!error} variant='danger'>
             <Trans i18nKey={error} />
diff --git a/frontend/src/pages/register.tsx b/frontend/src/pages/register.tsx
index a95080d55..ce6f988e2 100644
--- a/frontend/src/pages/register.tsx
+++ b/frontend/src/pages/register.tsx
@@ -8,7 +8,7 @@ import type { ApiError } from '../api/common/api-error'
 import { DisplayNameField } from '../components/common/fields/display-name-field'
 import { NewPasswordField } from '../components/common/fields/new-password-field'
 import { PasswordAgainField } from '../components/common/fields/password-again-field'
-import { UsernameField } from '../components/common/fields/username-field'
+import { UsernameLabelField } from '../components/common/fields/username-label-field'
 import { useFrontendConfig } from '../components/common/frontend-config-context/use-frontend-config'
 import { Redirect } from '../components/common/redirect'
 import { LandingLayout } from '../components/landing-layout/landing-layout'
@@ -63,6 +63,8 @@ export const RegisterPage: NextPage = () => {
     return error?.backendErrorName === 'PasswordTooWeakError'
   }, [error])
 
+  const isValidUsername = useMemo(() => Boolean(username.trim()), [username])
+
   const onUsernameChange = useLowercaseOnInputChange(setUsername)
   const onDisplayNameChange = useOnInputChange(setDisplayName)
   const onPasswordChange = useOnInputChange(setPassword)
@@ -87,7 +89,7 @@ export const RegisterPage: NextPage = () => {
             <Card className='mb-4 text-start'>
               <Card.Body>
                 <Form onSubmit={doRegisterSubmit} className={'d-flex flex-column gap-3'}>
-                  <UsernameField onChange={onUsernameChange} value={username} />
+                  <UsernameLabelField onChange={onUsernameChange} value={username} isValid={isValidUsername} />
                   <DisplayNameField onChange={onDisplayNameChange} value={displayName} />
                   <NewPasswordField onChange={onPasswordChange} value={password} hasError={isWeakPassword} />
                   <PasswordAgainField