diff --git a/react-ui/src/components/user/Settings.js b/react-ui/src/components/user/Settings.js
index 579610800..327dc416c 100644
--- a/react-ui/src/components/user/Settings.js
+++ b/react-ui/src/components/user/Settings.js
@@ -52,7 +52,7 @@ const Settings = ({ user, closeSettings, handleSuccess, handleError }) => {
     ],
   })
 
-  const handleProfileUpdate = async e => {
+  const handleSubmit = async () => {
     const newProfile = { ...forms }
     if (newProfile.country === "") newProfile.country = null
     if (newProfile.stick_sens === "") newProfile.stick_sens = null
@@ -79,7 +79,7 @@ const Settings = ({ user, closeSettings, handleSuccess, handleError }) => {
       <Header size="small">Profile picture</Header>
       To add a profile picture you need to verify your Twitter on Discord and
       log back in to sendou.ink
-      <Form style={{ marginTop: "2em" }}>
+      <Form style={{ marginTop: "2em" }} onSubmit={handleSubmit}>
         <Form.Field>
           <label>Country</label>
           <CountryDropdown
@@ -127,17 +127,17 @@ const Settings = ({ user, closeSettings, handleSuccess, handleError }) => {
             multiple
           />
         </Form.Field>
-      </Form>
-      <div style={{ marginTop: "1.5em" }}>
-        <Button onClick={() => handleProfileUpdate()} disabled={submitDisabled}>
-          Save
-        </Button>
-        <span style={{ marginLeft: "0.3em" }}>
-          <Button negative onClick={closeSettings}>
-            Cancel
+        <Form.Field>
+          <Button type="submit" disabled={submitDisabled}>
+            Save
           </Button>
-        </span>
-      </div>
+          <span style={{ marginLeft: "0.3em" }}>
+            <Button negative onClick={closeSettings}>
+              Cancel
+            </Button>
+          </span>
+        </Form.Field>
+      </Form>
     </>
   )
 }
diff --git a/react-ui/src/components/user/UserPage.js b/react-ui/src/components/user/UserPage.js
index 298f31890..ac1cf8b3e 100644
--- a/react-ui/src/components/user/UserPage.js
+++ b/react-ui/src/components/user/UserPage.js
@@ -88,7 +88,6 @@ const UserPage = () => {
     setTab(activeIndex)
   }
 
-  console.log("imageError", imageError)
   return (
     <>
       <>
diff --git a/schemas/user.js b/schemas/user.js
index 0b72b57ed..117fa52c6 100644
--- a/schemas/user.js
+++ b/schemas/user.js
@@ -110,7 +110,7 @@ const resolvers = {
           })
         }
 
-      if (args.stick_sens) {
+      if (args.stick_sens !== null) {
         const number = Math.floor(args.stick_sens * 10)
         if (number < -50 || number > 50 || number % 5 != 0) {
           throw new UserInputError("Invalid motion sensitivity", {
@@ -123,7 +123,7 @@ const resolvers = {
         delete args.stick_sens
       }
 
-      if (args.motion_sens) {
+      if (args.motion_sens !== null) {
         const number = Math.floor(args.motion_sens * 10)
         if (number < -50 || number > 50 || number % 5 != 0) {
           throw new UserInputError("Invalid motion sensitivity", {