diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/__tests__/index.spec.ts b/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/__tests__/index.spec.ts
index 3ddd010a8..d7c44a92a 100644
--- a/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/__tests__/index.spec.ts
+++ b/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/__tests__/index.spec.ts
@@ -29,198 +29,270 @@ const responseBody = {
 describe('Gitconfig API', () => {
   let gitConfigApiService: GitConfigApiService;
 
-  const stubCoreV1Api = {
-    readNamespacedConfigMap: () => {
-      return Promise.resolve({
-        body: responseBody as V1ConfigMap,
-        response: {} as IncomingMessage,
-      });
-    },
-    patchNamespacedConfigMap: () => {
-      return Promise.resolve({
-        body: responseBody as V1ConfigMap,
-        response: {} as IncomingMessage,
-      });
-    },
-  } as unknown as CoreV1Api;
-  const spyReadNamespacedConfigMap = jest.spyOn(stubCoreV1Api, 'readNamespacedConfigMap');
-  const spyPatchNamespacedConfigMap = jest.spyOn(stubCoreV1Api, 'patchNamespacedConfigMap');
+  describe('configmap not found', () => {
+    const stubCoreV1Api = {
+      createNamespacedConfigMap: () => {
+        return Promise.resolve({
+          body: responseBody as V1ConfigMap,
+          response: {} as IncomingMessage,
+        });
+      },
+      readNamespacedConfigMap: () => {
+        return Promise.reject({
+          body: {},
+          response: {} as IncomingMessage,
+          statusCode: 404,
+          name: 'HttpError',
+          message: 'Not Found',
+        });
+      },
+    } as unknown as CoreV1Api;
+    const spyCreateNamespacedConfigMap = jest.spyOn(stubCoreV1Api, 'createNamespacedConfigMap');
+
+    beforeEach(() => {
+      const { KubeConfig } = mockClient;
+      const kubeConfig = new KubeConfig();
+      kubeConfig.makeApiClient = jest.fn().mockImplementation(() => stubCoreV1Api);
+
+      gitConfigApiService = new GitConfigApiService(kubeConfig);
+    });
 
-  beforeEach(() => {
-    const { KubeConfig } = mockClient;
-    const kubeConfig = new KubeConfig();
-    kubeConfig.makeApiClient = jest.fn().mockImplementation(() => stubCoreV1Api);
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
 
-    gitConfigApiService = new GitConfigApiService(kubeConfig);
-  });
+    it('should create the configmap and return gitconfig', async () => {
+      const resp = await gitConfigApiService.read(namespace);
 
-  afterEach(() => {
-    jest.clearAllMocks();
+      expect(resp.gitconfig).toStrictEqual({
+        user: {
+          name: 'User One',
+          email: 'user-1@che',
+        },
+      });
+
+      expect(spyCreateNamespacedConfigMap).toHaveBeenCalledTimes(1);
+      expect(spyCreateNamespacedConfigMap).toHaveBeenCalledWith(namespace, {
+        data: {
+          gitconfig: `[user]
+name=""
+email=""
+`,
+        },
+        metadata: {
+          annotations: {
+            'controller.devfile.io/mount-as': 'subpath',
+            'controller.devfile.io/mount-path': '/etc/',
+          },
+          labels: {
+            'controller.devfile.io/mount-to-devworkspace': 'true',
+            'controller.devfile.io/watch-configmap': 'true',
+          },
+          name: 'workspace-userdata-gitconfig-configmap',
+          namespace,
+        },
+      });
+    });
   });
 
-  describe('reading gitconfig', () => {
-    it('should return gitconfig', async () => {
-      const resp = await gitConfigApiService.read(namespace);
+  describe('configmap found', () => {
+    const stubCoreV1Api = {
+      readNamespacedConfigMap: () => {
+        return Promise.resolve({
+          body: responseBody as V1ConfigMap,
+          response: {} as IncomingMessage,
+        });
+      },
+      patchNamespacedConfigMap: () => {
+        return Promise.resolve({
+          body: responseBody as V1ConfigMap,
+          response: {} as IncomingMessage,
+        });
+      },
+    } as unknown as CoreV1Api;
+    const spyReadNamespacedConfigMap = jest.spyOn(stubCoreV1Api, 'readNamespacedConfigMap');
+    const spyPatchNamespacedConfigMap = jest.spyOn(stubCoreV1Api, 'patchNamespacedConfigMap');
+
+    beforeEach(() => {
+      const { KubeConfig } = mockClient;
+      const kubeConfig = new KubeConfig();
+      kubeConfig.makeApiClient = jest.fn().mockImplementation(() => stubCoreV1Api);
+
+      gitConfigApiService = new GitConfigApiService(kubeConfig);
+    });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    describe('reading gitconfig', () => {
+      it('should return gitconfig', async () => {
+        const resp = await gitConfigApiService.read(namespace);
 
-      expect(resp.gitconfig).toStrictEqual(
-        expect.objectContaining({
-          user: expect.objectContaining({
-            name: 'User One',
-            email: 'user-1@che',
+        expect(resp.gitconfig).toStrictEqual(
+          expect.objectContaining({
+            user: expect.objectContaining({
+              name: 'User One',
+              email: 'user-1@che',
+            }),
           }),
-        }),
-      );
+        );
 
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).not.toHaveBeenCalled();
-    });
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).not.toHaveBeenCalled();
+      });
 
-    it('should throw', async () => {
-      spyReadNamespacedConfigMap.mockRejectedValueOnce('404 not found');
+      it('should throw', async () => {
+        spyReadNamespacedConfigMap.mockRejectedValueOnce('404 not found');
 
-      try {
-        await gitConfigApiService.read(namespace);
+        try {
+          await gitConfigApiService.read(namespace);
 
-        // should not reach here
-        expect(false).toBeTruthy();
-      } catch (e) {
-        expect((e as Error).message).toBe(
-          'Unable to read gitconfig in the namespace "user-che": 404 not found',
-        );
-      }
+          // should not reach here
+          expect(false).toBeTruthy();
+        } catch (e) {
+          expect((e as Error).message).toBe(
+            'Unable to read gitconfig in the namespace "user-che": 404 not found',
+          );
+        }
 
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).not.toHaveBeenCalled();
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).not.toHaveBeenCalled();
+      });
     });
-  });
 
-  describe('patching gitconfig', () => {
-    it('should patch and return gitconfig', async () => {
-      const newGitConfig = {
-        gitconfig: {
-          user: {
-            email: 'user-2@che',
-            name: 'User Two',
+    describe('patching gitconfig', () => {
+      it('should patch and return gitconfig', async () => {
+        const newGitConfig = {
+          gitconfig: {
+            user: {
+              email: 'user-2@che',
+              name: 'User Two',
+            },
           },
-        },
-      } as api.IGitConfig;
-      await gitConfigApiService.patch(namespace, newGitConfig);
-
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).toHaveBeenCalledWith(
-        'workspace-userdata-gitconfig-configmap',
-        'user-che',
-        {
-          data: {
-            gitconfig: `[user]
+        } as api.IGitConfig;
+        await gitConfigApiService.patch(namespace, newGitConfig);
+
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).toHaveBeenCalledWith(
+          'workspace-userdata-gitconfig-configmap',
+          'user-che',
+          {
+            data: {
+              gitconfig: `[user]
 email="user-2@che"
 name="User Two"
 `,
+            },
           },
-        },
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        { headers: { 'content-type': 'application/strategic-merge-patch+json' } },
-      );
-    });
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          { headers: { 'content-type': 'application/strategic-merge-patch+json' } },
+        );
+      });
 
-    it('should throw when can`t read the ConfigMap', async () => {
-      spyReadNamespacedConfigMap.mockRejectedValueOnce('404 not found');
+      it('should throw when can`t read the ConfigMap', async () => {
+        spyReadNamespacedConfigMap.mockRejectedValueOnce('404 not found');
 
-      const newGitConfig = {
-        gitconfig: {
-          user: {
-            email: 'user-2@che',
-            name: 'User Two',
+        const newGitConfig = {
+          gitconfig: {
+            user: {
+              email: 'user-2@che',
+              name: 'User Two',
+            },
           },
-        },
-      } as api.IGitConfig;
+        } as api.IGitConfig;
 
-      try {
-        await gitConfigApiService.patch(namespace, newGitConfig);
+        try {
+          await gitConfigApiService.patch(namespace, newGitConfig);
 
-        // should not reach here
-        expect(false).toBeTruthy();
-      } catch (e) {
-        expect((e as Error).message).toBe(
-          'Unable to update gitconfig in the namespace "user-che".',
-        );
-      }
+          // should not reach here
+          expect(false).toBeTruthy();
+        } catch (e) {
+          expect((e as Error).message).toBe(
+            'Unable to update gitconfig in the namespace "user-che".',
+          );
+        }
 
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(0);
-    });
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(0);
+      });
 
-    it('should throw when failed to patch the ConfigMap', async () => {
-      spyPatchNamespacedConfigMap.mockRejectedValueOnce('some error');
+      it('should throw when failed to patch the ConfigMap', async () => {
+        spyPatchNamespacedConfigMap.mockRejectedValueOnce('some error');
 
-      const newGitConfig = {
-        gitconfig: {
-          user: {
-            email: 'user-2@che',
-            name: 'User Two',
+        const newGitConfig = {
+          gitconfig: {
+            user: {
+              email: 'user-2@che',
+              name: 'User Two',
+            },
           },
-        },
-      } as api.IGitConfig;
+        } as api.IGitConfig;
 
-      try {
-        await gitConfigApiService.patch(namespace, newGitConfig);
+        try {
+          await gitConfigApiService.patch(namespace, newGitConfig);
 
-        // should not reach here
-        expect(false).toBeTruthy();
-      } catch (e) {
-        expect((e as Error).message).toBe(
-          'Unable to update gitconfig in the namespace "user-che": some error',
-        );
-      }
+          // should not reach here
+          expect(false).toBeTruthy();
+        } catch (e) {
+          expect((e as Error).message).toBe(
+            'Unable to update gitconfig in the namespace "user-che": some error',
+          );
+        }
 
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(1);
-    });
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(1);
+      });
 
-    it('should throw when conflict detected', async () => {
-      spyReadNamespacedConfigMap.mockResolvedValueOnce({
-        body: {
-          metadata: {
-            resourceVersion: '2',
-          },
-          data: {
-            gitconfig: `[user]
+      it('should throw when conflict detected', async () => {
+        spyReadNamespacedConfigMap.mockResolvedValueOnce({
+          body: {
+            metadata: {
+              resourceVersion: '2',
+            },
+            data: {
+              gitconfig: `[user]
 name="User Two"
 email="user-2@che"
 `,
+            },
+          } as V1ConfigMap,
+          response: {} as IncomingMessage,
+        });
+
+        const newGitConfig = {
+          gitconfig: {
+            user: {
+              email: 'user-2@che',
+              name: 'User Two',
+            },
           },
-        } as V1ConfigMap,
-        response: {} as IncomingMessage,
-      });
+          resourceVersion: '1',
+        } as api.IGitConfig;
 
-      const newGitConfig = {
-        gitconfig: {
-          user: {
-            email: 'user-2@che',
-            name: 'User Two',
-          },
-        },
-        resourceVersion: '1',
-      } as api.IGitConfig;
+        let isPatched = false;
+        let errorMessage = '';
 
-      try {
-        await gitConfigApiService.patch(namespace, newGitConfig);
+        try {
+          await gitConfigApiService.patch(namespace, newGitConfig);
+          isPatched = true;
+        } catch (e: unknown) {
+          errorMessage = (e as Error).message;
+        }
 
-        // should not reach here
-        expect(false).toBeTruthy();
-      } catch (e) {
-        expect((e as Error).message).toBe(
+        expect(isPatched).toBe(false);
+        expect(errorMessage).toBe(
           'Conflict detected. The gitconfig was modified in the namespace "user-che".',
         );
-      }
 
-      expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
-      expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(0);
+        expect(spyReadNamespacedConfigMap).toHaveBeenCalledTimes(1);
+        expect(spyPatchNamespacedConfigMap).toHaveBeenCalledTimes(0);
+      });
     });
   });
 });
diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/index.ts b/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/index.ts
index 1a4118e22..254e41e87 100644
--- a/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/index.ts
+++ b/packages/dashboard-backend/src/devworkspaceClient/services/gitConfigApi/index.ts
@@ -10,7 +10,7 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import { api } from '@eclipse-che/common';
+import { api, helpers } from '@eclipse-che/common';
 import * as k8s from '@kubernetes/client-node';
 import * as ini from 'multi-ini';
 
@@ -41,11 +41,54 @@ export class GitConfigApiService implements IGitConfigApi {
 
       return this.toGitConfig(response.body);
     } catch (error) {
+      if (helpers.errors.isKubeClientError(error) && error.statusCode === 404) {
+        // Create gitconfig configmap if it does not exist
+        return this.createGitConfigMap(namespace);
+      }
+
       const message = `Unable to read gitconfig in the namespace "${namespace}"`;
       throw createError(error, GITCONFIG_API_ERROR_LABEL, message);
     }
   }
 
+  /**
+   * @throws
+   * Creates `gitconfig` ConfigMap in the given `namespace`.
+   */
+  private async createGitConfigMap(namespace: string): Promise<api.IGitConfig> {
+    const configMap = new k8s.V1ConfigMap();
+    configMap.metadata = {
+      name: GITCONFIG_CONFIGMAP,
+      namespace,
+      labels: {
+        'controller.devfile.io/mount-to-devworkspace': 'true',
+        'controller.devfile.io/watch-configmap': 'true',
+      },
+      annotations: {
+        'controller.devfile.io/mount-as': 'subpath',
+        'controller.devfile.io/mount-path': '/etc/',
+      },
+    };
+    configMap.data = {
+      gitconfig: this.fromGitConfig({
+        gitconfig: {
+          user: {
+            name: '',
+            email: '',
+          },
+        },
+      }),
+    };
+
+    try {
+      const response = await this.coreV1API.createNamespacedConfigMap(namespace, configMap);
+      return this.toGitConfig(response.body);
+    } catch (error) {
+      const message = `Unable to create gitconfig in the namespace "${namespace}"`;
+      throw createError(error, GITCONFIG_API_ERROR_LABEL, message);
+    }
+  }
+
   /**
    * @throws
    * Updates `gitconfig` in the given `namespace` with `changedGitConfig`.
diff --git a/packages/dashboard-backend/src/devworkspaceClient/services/helpers/prepareCoreV1API.ts b/packages/dashboard-backend/src/devworkspaceClient/services/helpers/prepareCoreV1API.ts
index 245672835..9a30e9405 100644
--- a/packages/dashboard-backend/src/devworkspaceClient/services/helpers/prepareCoreV1API.ts
+++ b/packages/dashboard-backend/src/devworkspaceClient/services/helpers/prepareCoreV1API.ts
@@ -16,6 +16,7 @@ import { retryableExec } from '@/devworkspaceClient/services/helpers/retryableEx
 
 export type CoreV1API = Pick<
   k8s.CoreV1Api,
+  | 'createNamespacedConfigMap'
   | 'createNamespacedSecret'
   | 'listNamespace'
   | 'listNamespacedEvent'
@@ -33,6 +34,8 @@ export type CoreV1API = Pick<
 export function prepareCoreV1API(kc: k8s.KubeConfig): CoreV1API {
   const coreV1API = kc.makeApiClient(k8s.CoreV1Api);
   return {
+    createNamespacedConfigMap: (...args: Parameters<typeof coreV1API.createNamespacedConfigMap>) =>
+      retryableExec(() => coreV1API.createNamespacedConfigMap(...args)),
     createNamespacedSecret: (...args: Parameters<typeof coreV1API.createNamespacedSecret>) =>
       retryableExec(() => coreV1API.createNamespacedSecret(...args)),
     listNamespace: (...args: Parameters<typeof coreV1API.listNamespace>) =>
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/__snapshots__/index.spec.tsx.snap b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/__snapshots__/index.spec.tsx.snap
index e909a3c32..ca40c0247 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/__snapshots__/index.spec.tsx.snap
@@ -31,7 +31,7 @@ exports[`GitConfigUserEmail snapshot 1`] = `
   >
     <div>
       <input
-        aria-invalid={true}
+        aria-invalid={false}
         aria-label={null}
         className="pf-c-form-control"
         data-ouia-component-id="OUIA-Generated-TextInputBase-2"
@@ -49,7 +49,7 @@ exports[`GitConfigUserEmail snapshot 1`] = `
       <span
         data-testid="validated"
       >
-        error
+        default
       </span>
       <button
         aria-disabled={false}
@@ -64,13 +64,6 @@ exports[`GitConfigUserEmail snapshot 1`] = `
         type="button"
       />
     </div>
-    <div
-      aria-live="polite"
-      className="pf-c-form__helper-text pf-m-error"
-      id="gitconfig-user-email-helper"
-    >
-      The value is not a valid email address.
-    </div>
   </div>
 </div>
 `;
@@ -106,7 +99,7 @@ exports[`GitConfigUserEmail snapshot, not loading 1`] = `
   >
     <div>
       <input
-        aria-invalid={true}
+        aria-invalid={false}
         aria-label={null}
         className="pf-c-form-control"
         data-ouia-component-id="OUIA-Generated-TextInputBase-1"
@@ -124,7 +117,7 @@ exports[`GitConfigUserEmail snapshot, not loading 1`] = `
       <span
         data-testid="validated"
       >
-        error
+        default
       </span>
       <button
         aria-disabled={false}
@@ -139,13 +132,6 @@ exports[`GitConfigUserEmail snapshot, not loading 1`] = `
         type="button"
       />
     </div>
-    <div
-      aria-live="polite"
-      className="pf-c-form__helper-text pf-m-error"
-      id="gitconfig-user-email-helper"
-    >
-      The value is not a valid email address.
-    </div>
   </div>
 </div>
 `;
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/index.spec.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/index.spec.tsx
index b363b89e7..a253f87db 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/index.spec.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/__tests__/index.spec.tsx
@@ -11,12 +11,15 @@
  */
 
 import { ValidatedOptions } from '@patternfly/react-core';
+import { StateMock } from '@react-mock/state';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
-import getComponentRenderer, { screen } from '@/services/__mocks__/getComponentRenderer';
-
-import { GitConfigUserEmail } from '..';
+import {
+  GitConfigUserEmail,
+  State,
+} from '@/pages/UserPreferences/GitConfig/Form/SectionUser/Email';
+import getComponentRenderer, { screen, waitFor } from '@/services/__mocks__/getComponentRenderer';
 
 jest.mock('@/components/InputGroupExtended');
 
@@ -67,14 +70,18 @@ describe('GitConfigUserEmail', () => {
     expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.error);
   });
 
-  it('should re-validate on component update', () => {
-    const { reRenderComponent } = renderComponent('', false);
-
-    expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.error);
+  it('should reset validation', async () => {
+    const localState: Partial<State> = {
+      value: '',
+      validated: ValidatedOptions.error,
+    };
+    const { reRenderComponent } = renderComponent('user@che.org', true, localState);
 
-    reRenderComponent('user@che.com', false);
+    reRenderComponent('user@che.org', false, localState);
 
-    expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.default);
+    await waitFor(() =>
+      expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.default),
+    );
   });
 
   it('should handle value changing', async () => {
@@ -88,6 +95,17 @@ describe('GitConfigUserEmail', () => {
   });
 });
 
-function getComponent(value: string, isLoading: boolean): React.ReactElement {
+function getComponent(
+  value: string,
+  isLoading: boolean,
+  localState?: Partial<State>,
+): React.ReactElement {
+  if (localState) {
+    return (
+      <StateMock state={localState}>
+        <GitConfigUserEmail isLoading={isLoading} value={value} onChange={mockOnChange} />
+      </StateMock>
+    );
+  }
   return <GitConfigUserEmail isLoading={isLoading} value={value} onChange={mockOnChange} />;
 }
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/index.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/index.tsx
index 4e220fd71..0599169f2 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/index.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Email/index.tsx
@@ -28,8 +28,8 @@ export type Props = {
   onChange: (value: string, isValid: boolean) => void;
 };
 export type State = {
-  errorMessage?: string;
   validated: ValidatedOptions | undefined;
+  value: string | undefined;
 };
 
 export class GitConfigUserEmail extends React.PureComponent<Props, State> {
@@ -37,59 +37,59 @@ export class GitConfigUserEmail extends React.PureComponent<Props, State> {
     super(props);
 
     this.state = {
-      validated: undefined,
+      validated: ValidatedOptions.default,
+      value: props.value,
     };
   }
 
-  public componentDidMount(): void {
-    const { value } = this.props;
-    this.validate(value, true);
-  }
-
-  public componentDidUpdate(prevProps: Readonly<Props>): void {
-    const { value } = this.props;
-    if (value !== prevProps.value) {
-      this.validate(value, true);
+  public componentDidUpdate(_prevProps: Readonly<Props>, prevState: Readonly<State>): void {
+    if (prevState.value === this.state.value && this.props.value !== this.state.value) {
+      // reset the initial value
+      this.setState({
+        value: this.props.value,
+        validated: ValidatedOptions.default,
+      });
     }
   }
 
   private handleChange(value: string): void {
-    const isValid = this.validate(value);
+    const validate = this.validate(value);
+    const isValid = validate === ValidatedOptions.success;
+
+    this.setState({
+      value,
+      validated: validate,
+    });
     this.props.onChange(value, isValid);
   }
 
-  private validate(value: string, initial = false): boolean {
+  private validate(value: string): ValidatedOptions {
     if (value.length === 0) {
-      this.setState({
-        errorMessage: ERROR_REQUIRED_VALUE,
-        validated: ValidatedOptions.error,
-      });
-      return false;
+      return ValidatedOptions.error;
     }
     if (value.length > MAX_LENGTH) {
-      this.setState({
-        errorMessage: ERROR_MAX_LENGTH,
-        validated: ValidatedOptions.error,
-      });
-      return false;
+      return ValidatedOptions.error;
     }
     if (!REGEX.test(value)) {
-      this.setState({
-        errorMessage: ERROR_INVALID_EMAIL,
-        validated: ValidatedOptions.error,
-      });
-      return false;
+      return ValidatedOptions.error;
     }
-    this.setState({
-      errorMessage: undefined,
-      validated: initial === true ? ValidatedOptions.default : ValidatedOptions.success,
-    });
-    return true;
+    return ValidatedOptions.success;
   }
 
   public render(): React.ReactElement {
-    const { isLoading, value } = this.props;
-    const { errorMessage, validated } = this.state;
+    const { isLoading } = this.props;
+    const { value = '', validated } = this.state;
+
+    let errorMessage: string;
+    if (value.length === 0) {
+      errorMessage = ERROR_REQUIRED_VALUE;
+    } else if (value.length > MAX_LENGTH) {
+      errorMessage = ERROR_MAX_LENGTH;
+    } else if (!REGEX.test(value)) {
+      errorMessage = ERROR_INVALID_EMAIL;
+    } else {
+      errorMessage = '';
+    }
 
     const fieldId = 'gitconfig-user-email';
 
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/__tests__/index.spec.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/__tests__/index.spec.tsx
index 869f3101f..437f37689 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/__tests__/index.spec.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/__tests__/index.spec.tsx
@@ -11,12 +11,12 @@
  */
 
 import { ValidatedOptions } from '@patternfly/react-core';
+import { StateMock } from '@react-mock/state';
 import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
-import getComponentRenderer, { screen } from '@/services/__mocks__/getComponentRenderer';
-
-import { GitConfigUserName } from '..';
+import { GitConfigUserName, State } from '@/pages/UserPreferences/GitConfig/Form/SectionUser/Name';
+import getComponentRenderer, { screen, waitFor } from '@/services/__mocks__/getComponentRenderer';
 
 jest.mock('@/components/InputGroupExtended');
 
@@ -58,14 +58,20 @@ describe('GitConfigUserName', () => {
     expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.error);
   });
 
-  it('should re-validate on component update', () => {
-    const { reRenderComponent } = renderComponent('', false);
+  it('should reset validation', async () => {
+    const initialValue = 'user name';
+    const localState: Partial<State> = {
+      value: '',
+      validated: ValidatedOptions.error,
+    };
 
-    expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.error);
+    const { reRenderComponent } = renderComponent(initialValue, true, localState);
 
-    reRenderComponent('valid name', false);
+    reRenderComponent(initialValue, false, localState);
 
-    expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.default);
+    await waitFor(() =>
+      expect(screen.getByTestId('validated')).toHaveTextContent(ValidatedOptions.default),
+    );
   });
 
   it('should handle value changing', async () => {
@@ -79,6 +85,17 @@ describe('GitConfigUserName', () => {
   });
 });
 
-function getComponent(value: string, isLoading: boolean): React.ReactElement {
+function getComponent(
+  value: string,
+  isLoading: boolean,
+  localState?: Partial<State>,
+): React.ReactElement {
+  if (localState) {
+    return (
+      <StateMock state={localState}>
+        <GitConfigUserName isLoading={isLoading} value={value} onChange={mockOnChange} />
+      </StateMock>
+    );
+  }
   return <GitConfigUserName isLoading={isLoading} value={value} onChange={mockOnChange} />;
 }
diff --git a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/index.tsx b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/index.tsx
index 4d4cb1747..79384eba3 100644
--- a/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/index.tsx
+++ b/packages/dashboard-frontend/src/pages/UserPreferences/GitConfig/Form/SectionUser/Name/index.tsx
@@ -26,8 +26,8 @@ export type Props = {
   onChange: (value: string, isValid: boolean) => void;
 };
 export type State = {
-  errorMessage?: string;
   validated: ValidatedOptions | undefined;
+  value: string | undefined;
 };
 
 export class GitConfigUserName extends React.PureComponent<Props, State> {
@@ -35,53 +35,55 @@ export class GitConfigUserName extends React.PureComponent<Props, State> {
     super(props);
 
     this.state = {
-      validated: undefined,
+      validated: ValidatedOptions.default,
+      value: props.value,
     };
   }
 
-  public componentDidMount(): void {
-    const { value } = this.props;
-    this.validate(value, true);
-  }
-
-  public componentDidUpdate(prevProps: Readonly<Props>): void {
-    const { value } = this.props;
-    if (value !== prevProps.value) {
-      this.validate(value, true);
+  public componentDidUpdate(_prevProps: Readonly<Props>, prevState: Readonly<State>): void {
+    if (prevState.value === this.state.value && this.props.value !== this.state.value) {
+      // reset the initial value
+      this.setState({
+        value: this.props.value,
+        validated: ValidatedOptions.default,
+      });
     }
   }
 
   private handleChange(value: string): void {
-    const isValid = this.validate(value);
+    const validated = this.validate(value);
+    const isValid = validated === ValidatedOptions.success;
+
+    this.setState({
+      value,
+      validated,
+    });
     this.props.onChange(value, isValid);
   }
 
-  private validate(value: string, initial = false): boolean {
+  private validate(value: string): ValidatedOptions {
     if (value.length === 0) {
-      this.setState({
-        errorMessage: ERROR_REQUIRED_VALUE,
-        validated: ValidatedOptions.error,
-      });
-      return false;
+      return ValidatedOptions.error;
     }
     if (value.length > MAX_LENGTH) {
-      this.setState({
-        errorMessage: ERROR_MAX_LENGTH,
-        validated: ValidatedOptions.error,
-      });
-      return false;
+      return ValidatedOptions.error;
     }
 
-    this.setState({
-      errorMessage: undefined,
-      validated: initial === true ? ValidatedOptions.default : ValidatedOptions.success,
-    });
-    return true;
+    return ValidatedOptions.success;
   }
 
   public render(): React.ReactElement {
-    const { isLoading, value } = this.props;
-    const { errorMessage, validated } = this.state;
+    const { isLoading } = this.props;
+    const { value = '', validated } = this.state;
+
+    let errorMessage: string;
+    if (value.length === 0) {
+      errorMessage = ERROR_REQUIRED_VALUE;
+    } else if (value.length > MAX_LENGTH) {
+      errorMessage = ERROR_MAX_LENGTH;
+    } else {
+      errorMessage = '';
+    }
 
     const fieldId = 'gitconfig-user-name';