diff --git a/src/app/main/authPages/sign-up/SignUpPage.js b/src/app/main/authPages/sign-up/SignUpPage.js
index b40e5e7..0ee1f36 100644
--- a/src/app/main/authPages/sign-up/SignUpPage.js
+++ b/src/app/main/authPages/sign-up/SignUpPage.js
@@ -83,7 +83,7 @@ function SignUpPage({ t }) {
                   className="mb-28"
                   label={t('name')}
                   autoFocus
-                  type="name"
+                  type="text"
                   error={!!errors.name}
                   helperText={errors?.name?.message}
                   variant="outlined"
diff --git a/src/app/services/authService.js b/src/app/services/authService.js
index 387fa3a..50b618b 100644
--- a/src/app/services/authService.js
+++ b/src/app/services/authService.js
@@ -63,13 +63,12 @@ export default class AuthService extends FuseUtils.EventEmitter {
       }
 
       const userRef = firebaseDb.ref(this.#db, `users/${this.#auth.currentUser.uid}`);
-      const value = { data: { ...user } };
 
       firebaseDb
-        .set(userRef, value)
+        .set(userRef, user)
         .then(() => {
-          if (user.email) {
-            return firebaseAuth.updateEmail(this.#auth, user.email);
+          if (user.data.email !== this.#auth.currentUser.email) {
+            return firebaseAuth.updateEmail(this.#auth, user.data.email);
           }
 
           return null;
diff --git a/src/app/store/userSlice.js b/src/app/store/userSlice.js
index d9d6da1..002b421 100644
--- a/src/app/store/userSlice.js
+++ b/src/app/store/userSlice.js
@@ -22,7 +22,7 @@ export const updateUserSettings = createAsyncThunk(
   'user/updateSettings',
   async (settings, { dispatch, getState }) => {
     const { user } = getState();
-    const newUser = _.merge({}, user, { data: { settings } });
+    const newUser = _.merge({}, user, { data: { ...settings } });
 
     dispatch(updateUserData(newUser));
 
@@ -67,7 +67,6 @@ const initialState = {
   role: [], // guest
   data: {
     displayName: 'John Doe',
-    photoURL: 'assets/images/avatars/brian-hughes.jpg',
     email: 'johndoe@withinpixels.com',
   },
 };