diff --git a/cypress/integration/app/settingsflow.spec.ts b/cypress/integration/app/settingsflow.spec.ts
new file mode 100644
index 0000000000..7db503b7b6
--- /dev/null
+++ b/cypress/integration/app/settingsflow.spec.ts
@@ -0,0 +1,140 @@
+describe("Settings flow", () => {
+  beforeEach(() => {
+    cy.setup();
+    cy.login();
+  });
+
+  it("Modifies and updates all setting successfully", () => {
+    cy.visit("/settings/organization");
+
+    cy.findByLabelText(/organization name/i)
+      .click()
+      .type("{selectall}{backspace}TJ's Run");
+
+    cy.findByLabelText(/organization avatar url/i)
+      .click()
+      .type("http://tjsrun.com/img/logo.png");
+
+    cy.findByLabelText(/fleet app url/i)
+      .click()
+      .type("{selectall}{backspace}https://localhost:5000");
+
+    cy.findByLabelText(/enable single sign on/i).check({ force: true });
+
+    cy.findByLabelText(/identity provider name/i)
+      .click()
+      .type("Rachel");
+
+    cy.findByLabelText(/entity id/i)
+      .click()
+      .type("my entity id");
+
+    cy.findByLabelText(/issuer uri/i)
+      .click()
+      .type("my issuer uri");
+
+    cy.findByLabelText(/idp image url/i)
+      .click()
+      .type("https://http.cat/100");
+
+    // only allowed to fill in either metadata || metadata url
+    cy.findByLabelText(/metadata url/i)
+      .click()
+      .type("http://github.com/fleetdm/fleet");
+
+    cy.findByLabelText(/allow sso login initiated/i).check({ force: true });
+
+    cy.findByLabelText(/enable smtp/i).check({ force: true });
+
+    cy.findByLabelText(/sender address/i)
+      .click()
+      .type("rachel@fleetdm.com");
+
+    cy.findByLabelText(/smtp server/i)
+      .click()
+      .type("localhost");
+
+    cy.get("#port").click().type("{selectall}{backspace}1025");
+
+    cy.findByLabelText(/use ssl\/tls/i).check({ force: true });
+
+    cy.findByLabelText(/smtp username/i)
+      .click()
+      .type("rachelsusername");
+
+    cy.findByLabelText(/smtp password/i)
+      .click()
+      .type("rachelspassword");
+
+    cy.get("#advanced-options").click();
+
+    cy.findByLabelText(/domain/i)
+      .click()
+      .type("http://www.fleetdm.com");
+
+    // can't grab button from the label because the button is a child element and doesn't have a for attribute
+    // couldn't figure out how to write a for attribute on kolide button
+    // Repeated Error Message: Timed out retrying after 4000ms: Found a label with the text of: /verify ssl certs/i, however no form control was found associated to that label. Make sure you're using the "for" attribute or "aria-labelledby" attribute correctly.
+    cy.get(".kolide-slider__dot").click({ multiple: true });
+
+    cy.findByLabelText(/host expiry window/i)
+      .click()
+      .type("{selectall}{backspace}5");
+
+    // Update settings
+    cy.findByRole("button", { name: /update settings/i }).click();
+
+    cy.findByText(/settings updated/i).should("exist");
+
+    cy.visit("/settings/organization");
+
+    cy.findByLabelText(/organization name/i).should("have.value", "TJ's Run");
+
+    cy.findByLabelText(/organization avatar url/i).should(
+      "have.value",
+      "http://tjsrun.com/img/logo.png"
+    );
+
+    cy.findByLabelText(/fleet app url/i).should(
+      "have.value",
+      "https://localhost:5000"
+    );
+
+    cy.findByLabelText(/identity provider name/i).should(
+      "have.value",
+      "Rachel"
+    );
+
+    cy.findByLabelText(/entity id/i).should("have.value", "my entity id");
+
+    cy.findByLabelText(/issuer uri/i).should("have.value", "my issuer uri");
+
+    cy.findByLabelText(/idp image url/i).should(
+      "have.value",
+      "https://http.cat/100"
+    );
+
+    cy.findByLabelText(/metadata url/i).should(
+      "have.value",
+      "http://github.com/fleetdm/fleet"
+    );
+
+    cy.findByLabelText(/sender address/i).should(
+      "have.value",
+      "rachel@fleetdm.com"
+    );
+
+    cy.findByLabelText(/smtp server/i).should("have.value", "localhost");
+
+    cy.get("#port").should("have.value", "1025");
+
+    cy.findByLabelText(/smtp username/i).should(
+      "have.value",
+      "rachelsusername"
+    );
+
+    cy.get("#advanced-options").click();
+
+    cy.findByLabelText(/host expiry window/i).should("have.value", "5");
+  });
+});