diff --git a/src/components/Profile/PasswordChangeForm.tsx b/src/components/Profile/PasswordChangeForm.tsx
index 99b8417c..cd3e9d2e 100644
--- a/src/components/Profile/PasswordChangeForm.tsx
+++ b/src/components/Profile/PasswordChangeForm.tsx
@@ -60,6 +60,11 @@ export const PasswordChangeDialog: FC<PasswordChangeDialogProps> = ({open, close
     submitFormData(data)
   }
 
+  const onClose = () => {
+    reset()
+    close()
+  }
+
   const requiredRule = {required: '* Toto pole nemôže byť prázdne.'}
 
   return (
@@ -105,10 +110,10 @@ export const PasswordChangeDialog: FC<PasswordChangeDialogProps> = ({open, close
       }
       actions={
         <>
+          <Button onClick={onClose}>Zavrieť</Button>
           <Button type="submit" onClick={handleSubmit(onSubmit)}>
             Potvrdiť
           </Button>
-          <Button onClick={close}>Zavrieť</Button>
         </>
       }
     />
diff --git a/src/components/Profile/ProfileForm.tsx b/src/components/Profile/ProfileForm.tsx
index c9b6879f..cd636cce 100644
--- a/src/components/Profile/ProfileForm.tsx
+++ b/src/components/Profile/ProfileForm.tsx
@@ -118,12 +118,12 @@ export const ProfileForm: FC = () => {
         <FormInput control={control} name="parent_phone" label="telefónne číslo na rodiča" rules={phoneRule} />
         <p style={{fontWeight: 'bold'}}>* takto označéné polia sú povinné</p>
         <Stack direction={'row'} mt={3} spacing={2}>
-          <Button type="submit" onClick={scrollToTop}>
-            <Typography variant="button2"> Uložiť údaje </Typography>
-          </Button>
           <Button onClick={returnBack}>
             <Typography variant="button2"> Späť </Typography>
           </Button>
+          <Button type="submit" onClick={scrollToTop}>
+            <Typography variant="button2"> Uložiť údaje </Typography>
+          </Button>
         </Stack>
       </form>
     </div>