Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	components/pages/login/LoginForm.js

components/metrics/EventDataForm.js

@@ -211,7 +211,6 @@ export default function EventDataForm({ websiteId, onClose, className }) {
                   <TextField />
                 </FormInput>
               </FormRow>
-              +
               <FormButtons className={styles.formButtons}>
                 <Button variant="action" type="submit">
                   <FormattedMessage id="label.add-filter" defaultMessage="Add Filter" />

components/pages/settings/users/UsersTable.js

@@ -57,13 +57,11 @@ export default function UsersTable({ columns = defaultColumns, onLoading, onAddK
 
               row.action = (
                 <div className={styles.actions}>
-                  <Link href={`/users/${row.id}`} shallow>
-                    <a>
-                      <Button>
-                        <Icon icon="arrow-right" />
-                        Settings
-                      </Button>
-                    </a>
+                  <Link href={`/settings/users/${row.id}`}>
+                    <Button>
+                      <Icon icon="arrow-right" />
+                      Settings
+                    </Button>
                   </Link>
                 </div>
               );