diff --git a/client/src/components/Login.tsx b/client/src/components/Login.tsx
index 84e16aad..80ab1419 100644
--- a/client/src/components/Login.tsx
+++ b/client/src/components/Login.tsx
@@ -86,7 +86,7 @@ const LoginWithoutI18n = (props: LoginProps) => {
     onChange: onChangeUserType,
   } = useInput("");
 
-  const [verifyResent, setVerifyResent] = React.useState(false);
+  const [isEmailResent, setIsEmailResent] = React.useState(false);
 
   const [placeholderEmail, setPlaceholderEmail] = useState("");
 
@@ -189,17 +189,17 @@ const LoginWithoutI18n = (props: LoginProps) => {
           ) : (
             <>
               <Trans>Don't have an account?</Trans>
-              <Button
-                variant="text"
-                labelText={i18n._(t`Sign up`)}
-                className="ml-5 pt-20"
+              <button
+                className="button is-text ml-5 pt-20"
                 onClick={() => {
                   toggleLoginSignup(Step.RegisterAccount);
                   if (registerInModal && !showRegisterModal) {
                     setShowRegisterModal(true);
                   }
                 }}
-              />
+              >
+                <Trans>Sign up</Trans>
+              </button>
             </>
           )}
         </div>
@@ -211,13 +211,13 @@ const LoginWithoutI18n = (props: LoginProps) => {
     return (
       <div className="verify-email-container">
         <p>{i18n._(t`Click the link we sent to ${email}. It may take a few minutes to arrive.`)}</p>
-        {!verifyResent && (
+        {!isEmailResent && (
           <Trans render="span" className="resend-verify-label">
             Didn’t get the link?
           </Trans>
         )}
         <SendNewLink
-          setParentState={setVerifyResent}
+          setParentState={setIsEmailResent}
           variant="secondary"
           className="is-full-width"
           onClick={() => AuthClient.resendVerifyEmail()}
@@ -237,7 +237,7 @@ const LoginWithoutI18n = (props: LoginProps) => {
         <br />
         <br />
         <SendNewLink
-          setParentState={setVerifyResent}
+          setParentState={setIsEmailResent}
           variant="secondary"
           className="is-full-width"
           onClick={() => AuthClient.resendVerifyEmail()}
diff --git a/client/src/components/UserSettingField.tsx b/client/src/components/UserSettingField.tsx
index abc13212..c55e06e4 100644
--- a/client/src/components/UserSettingField.tsx
+++ b/client/src/components/UserSettingField.tsx
@@ -120,7 +120,7 @@ const EmailSettingFieldWithoutI18n = (props: EmailSettingFieldProps) => {
   const { i18n, currentValue, onSubmit } = props;
   const userContext = useContext(UserContext);
   const { email: oldEmail, verified } = userContext.user as JustfixUser;
-  const [verifyResent, setVerifyResent] = React.useState(false);
+  const [isEmailResent, setIsEmailResent] = React.useState(false);
   const [existingUserError, setExistingUserError] = useState(false);
   const {
     value: email,
@@ -162,9 +162,9 @@ const EmailSettingFieldWithoutI18n = (props: EmailSettingFieldProps) => {
         Email address not verified. Click the link we sent to {email} start receiving Building
         Updates.
       </Trans>
-      {!verifyResent && <Trans render="p">Didn’t get the link?</Trans>}
+      {!isEmailResent && <Trans render="p">Didn’t get the link?</Trans>}
       <SendNewLink
-        setParentState={setVerifyResent}
+        setParentState={setIsEmailResent}
         variant="secondary"
         onClick={() => AuthClient.resendVerifyEmail()}
       />
@@ -238,7 +238,7 @@ const UserSettingFieldWithoutI18n = (props: UserSettingFieldProps) => {
             <div className="user-setting-actions">
               <Button type="submit" variant="primary" size="small" labelText={i18n._(t`Save`)} />
               <Button
-                type="submit"
+                type="button"
                 variant="text"
                 size="small"
                 labelText={i18n._(t`Cancel`)}
@@ -253,13 +253,14 @@ const UserSettingFieldWithoutI18n = (props: UserSettingFieldProps) => {
             </Trans>
             <div>
               <span>{preview}</span>
-              <button
+              <Button
                 type="button"
-                className="button is-text edit-button"
+                variant="text"
+                size="small"
+                className="edit-button"
+                labelText={i18n._(t`Edit`)}
                 onClick={() => setEditing(true)}
-              >
-                <Trans>Edit</Trans>
-              </button>
+              />
             </div>
             {!!verifyCallout && verifyCallout}
           </>
diff --git a/client/src/containers/UnsubscribePage.tsx b/client/src/containers/UnsubscribePage.tsx
index ed0d0579..72f15ca8 100644
--- a/client/src/containers/UnsubscribePage.tsx
+++ b/client/src/containers/UnsubscribePage.tsx
@@ -77,7 +77,7 @@ const UnsubscribePage = withI18n()((props: withI18nProps) => {
         ))}
         <div className="unsubscribe-all-field">
           <Button
-            variant="text"
+            variant="secondary"
             size="small"
             labelText={i18n._(t`Unsubscribe from all`)}
             onClick={handleUnsubscribeAll}