diff --git a/src/frontend/src/components/gradientChooserComponent/index.tsx b/src/frontend/src/components/gradientChooserComponent/index.tsx
new file mode 100644
index 000000000..1209e6064
--- /dev/null
+++ b/src/frontend/src/components/gradientChooserComponent/index.tsx
@@ -0,0 +1,13 @@
+import { useState } from "react";
+import { gradients } from "../../utils/styleUtils";
+
+
+export default function GradientChooserComponent({value, onChange}){
+    return (
+        <div className="flex flex-wrap gap-4 justify-center items-center">
+            {gradients.map((gradient, idx) => 
+            <div onClick={() => {onChange(gradient)}} className={"w-12 h-12 rounded-full transition-all duration-400 " + gradient + (value === gradient ?  " shadow-lg ring-2 ring-primary" : "")} key={idx}></div>
+            )}
+            </div>
+    )
+}
\ No newline at end of file
diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx
index 69b493e89..7b0e32373 100644
--- a/src/frontend/src/components/headerComponent/index.tsx
+++ b/src/frontend/src/components/headerComponent/index.tsx
@@ -139,9 +139,7 @@ export default function Header(): JSX.Element {
                   <button
                     className={
                       "h-7 w-7 rounded-full focus-visible:outline-0 " +
-                      gradients[
-                        parseInt(userData?.id ?? "", 30) % gradients.length
-                      ]
+                      (userData!.profile_image ?? gradients[parseInt(userData!.id ?? "", 30) % gradients.length])
                     }
                   />
                 </DropdownMenuTrigger>
diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx
index e6cd84363..c917b4ef9 100644
--- a/src/frontend/src/contexts/authContext.tsx
+++ b/src/frontend/src/contexts/authContext.tsx
@@ -63,7 +63,7 @@ export function AuthProvider({ children }): React.ReactElement {
             .then((user) => {
               setUserData(user);
               setLoading(false);
-              const isSuperUser = user.is_superuser;
+              const isSuperUser = user!.is_superuser;
               setIsAdmin(isSuperUser);
             })
             .catch((error) => {});
diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts
index 15e315f97..2806d3e25 100644
--- a/src/frontend/src/controllers/API/index.ts
+++ b/src/frontend/src/controllers/API/index.ts
@@ -463,6 +463,8 @@ export async function updateUser(user_id: string, user: changeUser) {
     const res = await api.patch(`${BASE_URL_API}users/${user_id}`, user);
     if (res.status === 200) {
       return res.data;
+    } else {
+      throw new Error(res.data.toString());
     }
   } catch (error) {
     console.log("Error:", error);
diff --git a/src/frontend/src/pages/ProfileSettingsPage/index.tsx b/src/frontend/src/pages/ProfileSettingsPage/index.tsx
index 189b7c23f..4ddac280f 100644
--- a/src/frontend/src/pages/ProfileSettingsPage/index.tsx
+++ b/src/frontend/src/pages/ProfileSettingsPage/index.tsx
@@ -1,6 +1,7 @@
 import * as Form from "@radix-ui/react-form";
 import { useContext, useEffect, useState } from "react";
 import IconComponent from "../../components/genericIconComponent";
+import GradientChooserComponent from "../../components/gradientChooserComponent";
 import Header from "../../components/headerComponent";
 import InputComponent from "../../components/inputComponent";
 import { Button } from "../../components/ui/button";
@@ -13,6 +14,7 @@ import {
   inputHandlerEventType,
   patchUserInputStateType,
 } from "../../types/components";
+import { gradients } from "../../utils/styleUtils";
 export default function ProfileSettingsPage(): JSX.Element {
   const { setTabId } = useContext(TabsContext);
 
@@ -24,7 +26,7 @@ export default function ProfileSettingsPage(): JSX.Element {
   useEffect(() => {
     setTabId("");
   }, []);
-  const { setErrorData } = useContext(alertContext);
+  const { setErrorData, setSuccessData } = useContext(alertContext);
   const { userData } = useContext(AuthContext);
   const { password, cnfPassword, gradient } = inputState;
 
@@ -36,8 +38,12 @@ export default function ProfileSettingsPage(): JSX.Element {
       });
       return;
     }
+    try{
+      updateUser(userData!.id, { password, profile_image: gradient }).then(() => {setSuccessData({title: "Changes saved successfully!"})});
+    } catch (error) {
+      setErrorData({title: "Error saving changes", list: [error as string]});
+    }
 
-    updateUser(userData!.id, {password, profile_image: gradient});
   }
 
   function handleInput({
@@ -67,87 +73,81 @@ export default function ProfileSettingsPage(): JSX.Element {
             const data = Object.fromEntries(new FormData(event.currentTarget));
             event.preventDefault();
           }}
-          className="flex justify-between px-6"
+          className="flex h-full flex-col px-6 pb-16"
         >
-          <div className="flex gap-4">
-          <div className="mb-3 w-96">
-            <Form.Field name="password">
-              <Form.Label className="data-[invalid]:label-invalid">
-                Password <span className="font-medium text-destructive">*</span>
-              </Form.Label>
+          <div className="flex h-full flex-col gap-4">
+            <div className="flex gap-4">
+              <div className="mb-3 w-96">
+                <Form.Field name="password">
+                  <Form.Label className="data-[invalid]:label-invalid">
+                    Password{" "}
+                  </Form.Label>
 
-              <Form.Control asChild>
-                <InputComponent
-                  onChange={(value) => {
-                    handleInput({ target: { name: "password", value } });
-                  }}
-                  value={password}
-                  isForm
-                  password={true}
-                  required
-                  placeholder="Password"
-                  className="w-full"
-                />
-              </Form.Control>
+                  <Form.Control asChild>
+                    <InputComponent
+                      onChange={(value) => {
+                        handleInput({ target: { name: "password", value } });
+                      }}
+                      value={password}
+                      isForm
+                      password={true}
+                      placeholder="Password"
+                      className="w-full"
+                    />
+                  </Form.Control>
 
-              <Form.Message match="valueMissing" className="field-invalid">
-                Please enter your password
-              </Form.Message>
-            </Form.Field>
-          </div>
-          <div className="mb-3 w-96">
-            <Form.Field name="cnfPassword">
-              <Form.Label className="data-[invalid]:label-invalid">
-                Confirm Password{" "}
-                <span className="font-medium text-destructive">*</span>
-              </Form.Label>
+                  <Form.Message match="valueMissing" className="field-invalid">
+                    Please enter your password
+                  </Form.Message>
+                </Form.Field>
+              </div>
+              <div className="mb-3 w-96">
+                <Form.Field name="cnfPassword">
+                  <Form.Label className="data-[invalid]:label-invalid">
+                    Confirm Password{" "}
+                  </Form.Label>
 
-              <InputComponent
-                onChange={(value) => {
-                  handleInput({ target: { name: "cnfPassword", value } });
-                }}
-                value={cnfPassword}
-                isForm
-                password={true}
-                required
-                placeholder="Confirm Password"
-                className="w-full"
-              />
+                  <InputComponent
+                    onChange={(value) => {
+                      handleInput({ target: { name: "cnfPassword", value } });
+                    }}
+                    value={cnfPassword}
+                    isForm
+                    password={true}
+                    placeholder="Confirm Password"
+                    className="w-full"
+                  />
 
-              <Form.Message className="field-invalid" match="valueMissing">
-                Please confirm your password
-              </Form.Message>
-            </Form.Field>
+                  <Form.Message className="field-invalid" match="valueMissing">
+                    Please confirm your password
+                  </Form.Message>
+                </Form.Field>
+              </div>
+            </div>
             <Form.Field name="gradient">
               <Form.Label className="data-[invalid]:label-invalid">
-                Insert Gradient{" "}
-                <span className="font-medium text-destructive">*</span>
+                Profile Gradient{" "}
               </Form.Label>
 
-              <InputComponent
+              <div className="mt-4 w-[1010px]">
+              <GradientChooserComponent
+                value={gradient == "" ? (userData!.profile_image ?? gradients[parseInt(userData!.id ?? "", 30) % gradients.length]) : gradient}
                 onChange={(value) => {
                   handleInput({ target: { name: "gradient", value } });
                 }}
-                value={gradient}
-                isForm
-                password={true}
-                required
-                placeholder="Insert Gradient"
-                className="w-full"
               />
-
-              <Form.Message className="field-invalid" match="valueMissing">
-                Please insert gradient
-              </Form.Message>
+              </div>
             </Form.Field>
           </div>
-          </div>
-          <div className="w-40">
-            <Form.Submit asChild>
-              <Button className="mr-3 mt-6 w-full" type="submit">
-                Save
-              </Button>
-            </Form.Submit>
+
+          <div className="flex w-full justify-end">
+            <div className="w-32">
+              <Form.Submit asChild>
+                <Button className="mr-3 mt-6 w-full" type="submit">
+                  Save
+                </Button>
+              </Form.Submit>
+            </div>
           </div>
         </Form.Root>
       </div>
diff --git a/src/frontend/src/types/api/index.ts b/src/frontend/src/types/api/index.ts
index 247e3b2a2..d693badf0 100644
--- a/src/frontend/src/types/api/index.ts
+++ b/src/frontend/src/types/api/index.ts
@@ -91,6 +91,7 @@ export type Users = {
   username: string;
   is_active: boolean;
   is_superuser: boolean;
+  profile_image: string;
   create_at: Date;
   updated_at: Date;
 };