diff --git a/client/src/components/Board/ListAdd.jsx b/client/src/components/Board/ListAdd.jsx
index 4b238376..29a12c7f 100755
--- a/client/src/components/Board/ListAdd.jsx
+++ b/client/src/components/Board/ListAdd.jsx
@@ -89,7 +89,7 @@ const ListAdd = React.memo(({ onCreate, onClose }) => {
       <TextArea ref={nameField} name="name" value={data.name} placeholder={t('common.enterListTitle')} maxRows={2} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} />
       <div className={gStyles.controls}>
         <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
-        <Button style={ButtonStyle.Submit} content={t('action.addList')} />
+        <Button style={ButtonStyle.Submit} content={t('action.addList')} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/BoardActions/Connections/Connections.jsx b/client/src/components/BoardActions/Connections/Connections.jsx
index 02becb11..64a846b5 100644
--- a/client/src/components/BoardActions/Connections/Connections.jsx
+++ b/client/src/components/BoardActions/Connections/Connections.jsx
@@ -69,7 +69,7 @@ const Connections = React.memo(({ defaultData, onUpdate, onBack, onClose }) => {
           <Input ref={inputRef} value={data.githubRepo} name="githubRepo" onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} className={classNames(styles.field, isError && styles.fieldError)} />
           <div className={gStyles.controlsSpaceBetween}>
             <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
-            <Button style={ButtonStyle.Submit} content={t('action.save')} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/BoardAddPopup/BoardAddPopup.jsx b/client/src/components/BoardAddPopup/BoardAddPopup.jsx
index 14c2d4e7..de9a7688 100644
--- a/client/src/components/BoardAddPopup/BoardAddPopup.jsx
+++ b/client/src/components/BoardAddPopup/BoardAddPopup.jsx
@@ -202,7 +202,7 @@ const AddStep = React.memo(({ projects, projectId, skipProjectDropdown, isAdmin,
               <Icon type={data.import ? IconType.Attach : IconType.ArrowDown} size={IconSize.Size13} />
               {data.import ? data.import.file.name : t('action.import')}
             </Button>
-            <Button style={ButtonStyle.Submit} content={data.import ? t('common.importBoard', { context: 'title' }) : t('common.addBoard')} className={styles.submitButton} />
+            <Button style={ButtonStyle.Submit} content={data.import ? t('common.importBoard', { context: 'title' }) : t('common.addBoard')} className={styles.submitButton} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/Card/NameEdit.jsx b/client/src/components/Card/NameEdit.jsx
index dc135192..73eec319 100644
--- a/client/src/components/Card/NameEdit.jsx
+++ b/client/src/components/Card/NameEdit.jsx
@@ -96,7 +96,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
       <TextArea ref={field} value={value} maxRows={2} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} onFocus={handleFocus} />
       <div className={gStyles.controls}>
         <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
-        <Button style={ButtonStyle.Submit} content={t('action.save')} />
+        <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/CardModal/Activities/CommentEdit.jsx b/client/src/components/CardModal/Activities/CommentEdit.jsx
index 90f74683..b28a7391 100755
--- a/client/src/components/CardModal/Activities/CommentEdit.jsx
+++ b/client/src/components/CardModal/Activities/CommentEdit.jsx
@@ -156,7 +156,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, placeholder, comm
       />
       <div className={gStyles.controls}>
         <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
-        <Button style={ButtonStyle.Submit} content={t('action.save')} />
+        <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx b/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx
index 626cee1e..bd695e16 100644
--- a/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx
+++ b/client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx
@@ -47,7 +47,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => {
         <Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
         <div className={styles.inputLabel}>.txt</div>
         <div className={gStyles.controls}>
-          <Button style={ButtonStyle.Submit} content={t('action.createFile')} />
+          <Button style={ButtonStyle.Submit} content={t('action.createFile')} onClick={handleSubmit} />
         </div>
       </Form>
     </>
diff --git a/client/src/components/CardModal/Attachments/EditPopup.jsx b/client/src/components/CardModal/Attachments/EditPopup.jsx
index b104deb9..0450f109 100755
--- a/client/src/components/CardModal/Attachments/EditPopup.jsx
+++ b/client/src/components/CardModal/Attachments/EditPopup.jsx
@@ -73,7 +73,7 @@ const EditStep = React.memo(({ defaultData, onUpdate, onDelete, onClose }) => {
           <Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
           <div className={gStyles.controlsSpaceBetween}>
             <Button style={ButtonStyle.Cancel} content={t('action.delete')} onClick={handleDeleteClick} />
-            <Button style={ButtonStyle.Submit} content={t('action.save')} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/CardMoveStep/CardMoveStep.jsx b/client/src/components/CardMoveStep/CardMoveStep.jsx
index 8a0b0277..39fda2b9 100644
--- a/client/src/components/CardMoveStep/CardMoveStep.jsx
+++ b/client/src/components/CardMoveStep/CardMoveStep.jsx
@@ -125,7 +125,7 @@ const CardMoveStep = React.memo(({ projectsToLists, defaultPath, onMove, onTrans
             </>
           )}
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.move')} disabled={(selectedBoard && selectedBoard.isFetching !== false) || !selectedList} />
+            <Button style={ButtonStyle.Submit} content={t('action.move')} disabled={(selectedBoard && selectedBoard.isFetching !== false) || !selectedList} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/LabelsStep/AddStep.jsx b/client/src/components/LabelsStep/AddStep.jsx
index 42e69f8b..b7bb37b9 100755
--- a/client/src/components/LabelsStep/AddStep.jsx
+++ b/client/src/components/LabelsStep/AddStep.jsx
@@ -36,7 +36,7 @@ const AddStep = React.memo(({ defaultData, onCreate, onBack }) => {
         <Form onSubmit={handleSubmit}>
           <Editor data={data} onFieldChange={handleFieldChange} />
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.createLabel')} />
+            <Button style={ButtonStyle.Submit} content={t('action.createLabel')} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/LabelsStep/EditStep.jsx b/client/src/components/LabelsStep/EditStep.jsx
index 573b2e79..78785ec1 100755
--- a/client/src/components/LabelsStep/EditStep.jsx
+++ b/client/src/components/LabelsStep/EditStep.jsx
@@ -63,7 +63,7 @@ const EditStep = React.memo(({ defaultData, onUpdate, onDelete, onBack }) => {
           <Editor data={data} onFieldChange={handleFieldChange} />
           <div className={gStyles.controlsSpaceBetween}>
             <Button style={ButtonStyle.Cancel} content={t('action.delete')} onClick={handleDeleteClick} />
-            <Button style={ButtonStyle.Submit} content={t('action.save')} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/List/CardAdd.jsx b/client/src/components/List/CardAdd.jsx
index e18f13e5..32d3830f 100755
--- a/client/src/components/List/CardAdd.jsx
+++ b/client/src/components/List/CardAdd.jsx
@@ -104,7 +104,7 @@ const CardAdd = React.memo(({ isOpen, onCreate, onClose, labelIds, memberIds })
       <TextArea ref={nameField} name="name" value={data.name} placeholder={t('common.enterCardTitle')} maxRows={3} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} />
       <div className={gStyles.controls}>
         <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
-        <Button style={ButtonStyle.Submit} content={t('action.addCard')} />
+        <Button style={ButtonStyle.Submit} content={t('action.addCard')} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/MembershipPermissionsSelectStep/MembershipPermissionsSelectStep.jsx b/client/src/components/MembershipPermissionsSelectStep/MembershipPermissionsSelectStep.jsx
index 67891e83..8ecc822f 100644
--- a/client/src/components/MembershipPermissionsSelectStep/MembershipPermissionsSelectStep.jsx
+++ b/client/src/components/MembershipPermissionsSelectStep/MembershipPermissionsSelectStep.jsx
@@ -64,7 +64,7 @@ const MembershipPermissionsSelectStep = React.memo(({ defaultData, title, button
             </div>
           )}
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t(buttonContent)} />
+            <Button style={ButtonStyle.Submit} content={t(buttonContent)} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/ProjectAddPopup/ProjectAddPopup.jsx b/client/src/components/ProjectAddPopup/ProjectAddPopup.jsx
index 804e914a..e9f6b89c 100644
--- a/client/src/components/ProjectAddPopup/ProjectAddPopup.jsx
+++ b/client/src/components/ProjectAddPopup/ProjectAddPopup.jsx
@@ -50,7 +50,7 @@ const ProjectAddPopup = React.memo(({ defaultData, isSubmitting, onCreate, onClo
         <Form onSubmit={handleSubmit} className={styles.formWrapper} onKeyDown={handleKeyDown}>
           <Input ref={nameField} name="name" value={data.name} readOnly={isSubmitting} className={styles.field} onChange={handleFieldChange} />
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('common.addProject')} disabled={isSubmitting} />
+            <Button style={ButtonStyle.Submit} content={t('common.addProject')} disabled={isSubmitting} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/RenameStep/RenameStep.jsx b/client/src/components/RenameStep/RenameStep.jsx
index d57ffd79..57ad43ba 100644
--- a/client/src/components/RenameStep/RenameStep.jsx
+++ b/client/src/components/RenameStep/RenameStep.jsx
@@ -64,7 +64,7 @@ const RenameStep = React.memo(({ title, defaultData, onUpdate, onBack, onClose }
           <TextArea ref={field} name="name" value={data.name} onChange={handleFieldChange} onKeyDown={handleFieldKeyDown} maxRows={3} />
           <div className={gStyles.controlsSpaceBetween}>
             <Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={onClose} />
-            <Button style={ButtonStyle.Submit} content={t('action.save')} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/Settings/ProjectSettings/InformationEdit.jsx b/client/src/components/Settings/ProjectSettings/InformationEdit.jsx
index bbff6b77..a5693da3 100644
--- a/client/src/components/Settings/ProjectSettings/InformationEdit.jsx
+++ b/client/src/components/Settings/ProjectSettings/InformationEdit.jsx
@@ -49,7 +49,7 @@ const InformationEdit = React.memo(({ defaultData, onUpdate }) => {
       <div className={styles.text}>{t('common.title')}</div>
       <Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
       <div className={gStyles.controls}>
-        <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} />
+        <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/TimerEditStep/TimerEditStep.jsx b/client/src/components/TimerEditStep/TimerEditStep.jsx
index 31ce1970..4f5df473 100644
--- a/client/src/components/TimerEditStep/TimerEditStep.jsx
+++ b/client/src/components/TimerEditStep/TimerEditStep.jsx
@@ -123,7 +123,7 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
           </div>
           <div className={gStyles.controlsSpaceBetween}>
             <Button style={ButtonStyle.Cancel} content={t('action.remove')} onClick={handleClearClick} />
-            {isEditing && <Button style={ButtonStyle.Submit} content={t('action.save')} />}
+            {isEditing && <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />}
             {!isEditing &&
               (defaultValue && defaultValue.startedAt ? (
                 <Button style={ButtonStyle.Submit} type="button" title={t('action.stop')} onClick={handleStopClick}>
diff --git a/client/src/components/UserAddStep/UserAddStep.jsx b/client/src/components/UserAddStep/UserAddStep.jsx
index 639cb3bd..70ddbc69 100644
--- a/client/src/components/UserAddStep/UserAddStep.jsx
+++ b/client/src/components/UserAddStep/UserAddStep.jsx
@@ -139,7 +139,7 @@ const UserAddStep = React.memo(({ defaultData, isSubmitting, error, onCreate, on
           </div>
           <Input ref={usernameField} name="username" value={data.username || ''} readOnly={isSubmitting} className={styles.field} onChange={handleFieldChange} />
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.addUser')} disabled={isSubmitting} />
+            <Button style={ButtonStyle.Submit} content={t('action.addUser')} disabled={isSubmitting} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx b/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx
index c689123d..e24d4bfc 100644
--- a/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx
+++ b/client/src/components/UserEmailEditStep/UserEmailEditStep.jsx
@@ -132,7 +132,7 @@ const UserEmailEditStep = React.memo(({ defaultData, email, isSubmitting, error,
             </>
           )}
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/UserInformationEdit/UserInformationEdit.jsx b/client/src/components/UserInformationEdit/UserInformationEdit.jsx
index 80bbe8d2..7213a64b 100644
--- a/client/src/components/UserInformationEdit/UserInformationEdit.jsx
+++ b/client/src/components/UserInformationEdit/UserInformationEdit.jsx
@@ -50,7 +50,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
       <div className={styles.text}>{t('common.organization')}</div>
       <Input style={InputStyle.Default} name="organization" value={data.organization} className={styles.field} onChange={handleFieldChange} />
       <div className={gStyles.controls}>
-        <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} />
+        <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} onClick={handleSubmit} />
       </div>
     </Form>
   );
diff --git a/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx b/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx
index d4327e28..c3f3ca3d 100644
--- a/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx
+++ b/client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx
@@ -108,7 +108,7 @@ const UserPasswordEditStep = React.memo(({ defaultData, isSubmitting, error, use
             </>
           )}
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>
diff --git a/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx b/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx
index 6f4f417b..76c7e5af 100644
--- a/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx
+++ b/client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx
@@ -132,7 +132,7 @@ const UserUsernameEditStep = React.memo(({ defaultData, username, isSubmitting,
             </>
           )}
           <div className={gStyles.controls}>
-            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
+            <Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
           </div>
         </Form>
       </Popup.Content>